fix: remove event monitor before destroying window

daverodgman · Nov 27, 2018 · d1f0d6c · d1f0d6c
1 parent 9ff7807
commit d1f0d6c
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
@@ -480,7 +480,8 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 NativeWindowMac::~NativeWindowMac() {
-  [NSEvent removeMonitor:wheel_event_monitor_];
+  if (wheel_event_monitor_)
+    [NSEvent removeMonitor:wheel_event_monitor_];
 }
 
 void NativeWindowMac::SetContentView(views::View* view) {
@@ -517,6 +518,13 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
 }
 
 void NativeWindowMac::CloseImmediately() {
+  // Remove event monitor before destroying window, otherwise the monitor may
+  // call its callback after window has been destroyed.
+  if (wheel_event_monitor_) {
+    [NSEvent removeMonitor:wheel_event_monitor_];
+    wheel_event_monitor_ = nil;
+  }
+
   // Retain the child window before closing it. If the last reference to the
   // NSWindow goes away inside -[NSWindow close], then bad stuff can happen.
   // See e.g. http://crbug.com/616701.