Browse Source

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

Only begin sheet when no sheet parent
Kevin Sawicki 8 years ago
parent
commit
ff6a8fac2a
1 changed files with 3 additions and 2 deletions
  1. 3 2
      atom/browser/native_window_mac.mm

+ 3 - 2
atom/browser/native_window_mac.mm

@@ -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;
   }