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

fix: Native window close crash (#15338)

Browse source
This commit is contained in:
trop[bot] 2018-10-23 12:00:39 -07:00 committed by Shelley Vohr
parent c7501bd7ca
commit dab77256d2
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/ui/cocoa/atom_ns_window_delegate.mm
View file

@ -9,6 +9,7 @@
#include "atom/browser/ui/cocoa/atom_preview_item.h" #include "atom/browser/ui/cocoa/atom_preview_item.h"
#include "atom/browser/ui/cocoa/atom_touch_bar.h" #include "atom/browser/ui/cocoa/atom_touch_bar.h"
#include "base/mac/mac_util.h" #include "base/mac/mac_util.h"
#include "ui/views/cocoa/bridged_native_widget.h"
#include "ui/views/widget/native_widget_mac.h" #include "ui/views/widget/native_widget_mac.h"
@implementation AtomNSWindowDelegate @implementation AtomNSWindowDelegate
@ -238,7 +239,10 @@
// Clears the delegate when window is going to be closed, since EL Capitan it // Clears the delegate when window is going to be closed, since EL Capitan it
// is possible that the methods of delegate would get called after the window // is possible that the methods of delegate would get called after the window
// has been closed. // has been closed.
[shell_->GetNativeWindow() setDelegate:nil]; views::BridgedNativeWidget* bridged_view =
views::NativeWidgetMac::GetBridgeForNativeWindow(
shell_->GetNativeWindow());
bridged_view->OnWindowWillClose();
} }
- (BOOL)windowShouldClose:(id)window { - (BOOL)windowShouldClose:(id)window {