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

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
commit ff6a8fac2a
1 changed files with 3 additions and 2 deletions
Show stats 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() { void NativeWindowMac::Show() {
if (is_modal() && parent()) { if (is_modal() && parent()) {
[parent()->GetNativeWindow() beginSheet:window_ if ([window_ sheetParent] == nil)
completionHandler:^(NSModalResponse) {}]; [parent()->GetNativeWindow() beginSheet:window_
completionHandler:^(NSModalResponse) {}];
return; return;
} }