fix: potential "Object has been destroyed" error in BrowserWindow.get…

…FocusedWindow (#35645) Co-authored-by: Milan Burda <milan.burda@gmail.com>
electron · Sep 13, 2022 · 90068fa · 90068fa
1 parent 27dc8d4
commit 90068fa
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/browser/api/browser-window.ts b/lib/browser/api/browser-window.ts
@@ -72,9 +72,8 @@ BrowserWindow.getAllWindows = () => {
 
 BrowserWindow.getFocusedWindow = () => {
   for (const window of BrowserWindow.getAllWindows()) {
-    const hasWC = window.webContents && !window.webContents.isDestroyed();
-    if (!window.isDestroyed() && hasWC) {
-      if (window.isFocused() || window.isDevToolsFocused()) return window;
+    if (!window.isDestroyed() && window.webContents && !window.webContents.isDestroyed()) {
+      if (window.isFocused() || window.webContents.isDevToolsFocused()) return window;
     }
   }
   return null;