зеркало из https://github.com/electron/electron.git
fix: crash on macOS non-programmatic close (#41264)
This commit is contained in:
Родитель
9655ae7d6a
Коммит
c894645ac6
|
@ -439,11 +439,14 @@ void NativeWindowMac::Close() {
|
|||
if ([window_ attachedSheet])
|
||||
[window_ endSheet:[window_ attachedSheet]];
|
||||
|
||||
// window_ could be nil after performClose.
|
||||
bool should_notify = is_modal() && parent() && IsVisible();
|
||||
|
||||
[window_ performClose:nil];
|
||||
|
||||
// Closing a sheet doesn't trigger windowShouldClose,
|
||||
// so we need to manually call it ourselves here.
|
||||
if (is_modal() && parent() && IsVisible()) {
|
||||
if (should_notify) {
|
||||
NotifyWindowCloseButtonClicked();
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче