25 lines
893 B
Diff
25 lines
893 B
Diff
diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
|
|
index a4f7d2429ce6c..2291b46582239 100644
|
|
--- base/message_loop/message_pump_mac.mm
|
|
+++ base/message_loop/message_pump_mac.mm
|
|
@@ -662,7 +662,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.
|
|
@@ -672,7 +673,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
|
|
}
|
|
|
|
ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() {
|
|
- DCHECK(g_app_pump);
|
|
+ if (!g_app_pump)
|
|
+ return;
|
|
g_app_pump->SetModeMask(kNSApplicationModalSafeModeMask);
|
|
}
|
|
|