diff --git base/message_loop/message_pump_apple.mm base/message_loop/message_pump_apple.mm index 570a7583512b0..9a38033880604 100644 --- base/message_loop/message_pump_apple.mm +++ base/message_loop/message_pump_apple.mm @@ -764,7 +764,8 @@ void MessagePumpUIApplication::Detach() { #else ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() { - DCHECK(g_app_pump); + if (!g_app_pump) + return; DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask()); // Pumping events in private runloop modes is known to interact badly with // app modal windows like NSAlert. @@ -775,7 +776,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() { } ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() { - DCHECK(g_app_pump); + if (!g_app_pump) + return; g_app_pump->SetModeMask(kNSApplicationModalSafeModeMask); }