From e9823f07bec8e054eab08c0237a0b8652ad8e34d Mon Sep 17 00:00:00 2001 From: "trop[bot]" Date: Sun, 11 Nov 2018 10:44:06 -0800 Subject: [PATCH] fix: NSWindow crash happening on macos 10.9 (#15669) --- atom/browser/native_window_mac.mm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index bf9e53250d50..b3515b9e547e 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -515,6 +515,11 @@ void NativeWindowMac::Close() { } void NativeWindowMac::CloseImmediately() { + // 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. + base::scoped_nsobject child_window(window_, + base::scoped_policy::RETAIN); [window_ close]; }