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

fix: dialog fails to show after modal close (#22858)

Browse source
This commit is contained in:
Shelley Vohr 2020-03-30 09:48:20 -07:00 • committed by GitHub
parent c085d3bf12
commit b14608c2c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/ui/cocoa/electron_ns_window.mm
View file

@ -192,6 +192,10 @@ bool ScopedDisableResize::disable_resize_ = false;
return;
}
[self close];
} else if (shell_->is_modal() && shell_->parent() && shell_->IsVisible()) {
// We don't want to actually call [window close] here since
// we've already called endSheet on the modal sheet.
return;
} else {
[super performClose:sender];
}