2018-09-28 16:27:09 +02:00
|
|
|
diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
|
2020-07-08 19:23:29 +02:00
|
|
|
index 1d0ac66a9174..4ddaca449e8b 100644
|
2018-09-28 16:27:09 +02:00
|
|
|
--- base/message_loop/message_pump_mac.mm
|
|
|
|
+++ base/message_loop/message_pump_mac.mm
|
2020-07-08 19:23:29 +02:00
|
|
|
@@ -644,7 +644,8 @@ void MessagePumpUIApplication::Detach() {
|
2018-09-28 16:27:09 +02:00
|
|
|
#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.
|
2020-07-08 19:23:29 +02:00
|
|
|
@@ -654,7 +655,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
|
2018-09-28 16:27:09 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() {
|
|
|
|
- DCHECK(g_app_pump);
|
|
|
|
+ if (!g_app_pump)
|
|
|
|
+ return;
|
|
|
|
g_app_pump->SetModeMask(kNSApplicationModalSafeModeMask);
|
|
|
|
}
|
2020-07-08 19:23:29 +02:00
|
|
|
|