fix: potential crash on macOS app exit (#29962)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
electron · Jul 1, 2021 · ebd1261 · ebd1261
1 parent 9957887
commit ebd1261
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
@@ -415,7 +415,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   // Use an NSEvent monitor to listen for the wheel event.
   BOOL __block began = NO;
   wheel_event_monitor_ = [NSEvent
-      addLocalMonitorForEventsMatchingMask:NSScrollWheelMask
+      addLocalMonitorForEventsMatchingMask:NSEventMaskScrollWheel
                                    handler:^(NSEvent* event) {
                                      if ([[event window] windowNumber] !=
                                          [window_ windowNumber])
@@ -1699,7 +1699,10 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
   DCHECK(!IsClosed());
   ui::NativeTheme::GetInstanceForNativeUi()->RemoveObserver(this);
   display::Screen::GetScreen()->RemoveObserver(this);
-  [NSEvent removeMonitor:wheel_event_monitor_];
+  if (wheel_event_monitor_) {
+    [NSEvent removeMonitor:wheel_event_monitor_];
+    wheel_event_monitor_ = nil;
+  }
 }
 
 void NativeWindowMac::OverrideNSWindowContentView() {