mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: remove event monitor before destroying window

Browse source
This commit is contained in:
Cheng Zhao 2018-11-27 11:09:39 +09:00
parent 9ff7807be8
commit d1f0d6c184
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/native_window_mac.mm
View file

@ -480,7 +480,8 @@ NativeWindowMac::NativeWindowMac(const mate::Dictionary& options,
} }
NativeWindowMac::~NativeWindowMac() { NativeWindowMac::~NativeWindowMac() {
[NSEvent removeMonitor:wheel_event_monitor_]; if (wheel_event_monitor_)
[NSEvent removeMonitor:wheel_event_monitor_];
} }
void NativeWindowMac::SetContentView(views::View* view) { void NativeWindowMac::SetContentView(views::View* view) {
@ -517,6 +518,13 @@ void NativeWindowMac::Close() {
} }
void NativeWindowMac::CloseImmediately() { 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 // Retain the child window before closing it. If the last reference to the
// NSWindow goes away inside -[NSWindow close], then bad stuff can happen. // NSWindow goes away inside -[NSWindow close], then bad stuff can happen.
// See e.g. http://crbug.com/616701. // See e.g. http://crbug.com/616701.