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

fix: emit 'shutdown' outside -[NSApplication terminate:] (#24111)

Browse source
This commit is contained in:
Shelley Vohr 2020-06-15 18:58:28 -07:00 • committed by GitHub
parent 0b830ba9e5
commit 9c7d73c6d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
shell/browser/mac/electron_application.mm
View file

@ -41,9 +41,14 @@ inline void dispatch_sync_main(dispatch_block_t block) {
return (AtomApplication*)[super sharedApplication];
}
- (void)willPowerOff:(NSNotification*)notify {
userStoppedShutdown_ = shouldShutdown_ && !shouldShutdown_.Run();
}
- (void)terminate:(id)sender {
if (shouldShutdown_ && !shouldShutdown_.Run())
return; // User will call Quit later.
// User will call Quit later.
if (userStoppedShutdown_)
return;
// We simply try to close the browser, which in turn will try to close the
// windows. Termination can proceed if all windows are closed or window close