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

fix: crash on macOS non-programmatic close (#41264)

Browse source
This commit is contained in:
Shelley Vohr 2024-02-09 22:44:24 +01:00 • committed by GitHub
parent 9655ae7d6a
commit c894645ac6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
shell/browser/native_window_mac.mm
View file

@ -439,11 +439,14 @@ void NativeWindowMac::Close() {
if ([window_ attachedSheet]) if ([window_ attachedSheet])
[window_ endSheet:[window_ attachedSheet]]; [window_ endSheet:[window_ attachedSheet]];
// window_ could be nil after performClose.
bool should_notify = is_modal() && parent() && IsVisible();
[window_ performClose:nil]; [window_ performClose:nil];
// Closing a sheet doesn't trigger windowShouldClose, // Closing a sheet doesn't trigger windowShouldClose,
// so we need to manually call it ourselves here. // so we need to manually call it ourselves here.
if (is_modal() && parent() && IsVisible()) { if (should_notify) {
NotifyWindowCloseButtonClicked(); NotifyWindowCloseButtonClicked();
} }
} }