github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7417 from electron/check-sheet-parent-before-beginning

Browse Source 
Only begin sheet when no sheet parent
This commit is contained in:
Kevin Sawicki
2016-09-30 13:08:35 -07:00
committed by GitHub
parent fb41474555 1807458c66
commit ff6a8fac2a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
atom/browser/native_window_mac.mm
View File

@@ -740,8 +740,9 @@ bool NativeWindowMac::IsFocused() {
void NativeWindowMac::Show() {
if (is_modal() && parent()) {
[parent()->GetNativeWindow() beginSheet:window_
completionHandler:^(NSModalResponse) {}];
if ([window_ sheetParent] == nil)
[parent()->GetNativeWindow() beginSheet:window_
completionHandler:^(NSModalResponse) {}];
return;
}