fix: nullptr check when closing windows

electron · Apr 3, 2020 · dbdc2bd · dbdc2bd
1 parent 1d15839
commit dbdc2bd
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/shell/browser/window_list.cc b/shell/browser/window_list.cc
@@ -84,16 +84,19 @@ void WindowList::CloseAllWindows() {
 #if defined(OS_MACOSX)
   std::reverse(windows.begin(), windows.end());
 #endif
-  for (auto* const& window : windows)
-    if (!window->IsClosed())
+  for (auto* const& window : windows) {
+    if (window && !window->IsClosed())
       window->Close();
+  }
 }
 
 // static
 void WindowList::DestroyAllWindows() {
   WindowVector windows = GetInstance()->windows_;
-  for (auto* const& window : windows)
-    window->CloseImmediately();  // e.g. Destroy()
+  for (auto* const& window : windows) {
+    if (window)
+      window->CloseImmediately();
+  }
 }
 
 WindowList::WindowList() = default;