fix: crash on macOS non-programmatic close (#41264)

electron · Feb 9, 2024 · c894645 · c894645
1 parent 9655ae7
commit c894645
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/shell/browser/native_window_mac.mm b/shell/browser/native_window_mac.mm
@@ -439,11 +439,14 @@ void ReorderChildWindowAbove(NSWindow* child_window, NSWindow* other_window) {
   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();
   }
 }