From b3a744db8a1aa85f27f4467ae2eb1a8c2eff0233 Mon Sep 17 00:00:00 2001
From: Milan Burda <milan.burda@gmail.com>
Date: Mon, 12 Sep 2022 23:46:05 +0200
Subject: [PATCH] fix: potential "Object has been destroyed" error in
 BrowserWindow.getFocusedWindow (#35520)

---
 lib/browser/api/browser-window.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/browser/api/browser-window.ts b/lib/browser/api/browser-window.ts
index d20ea0bda557..053e09ab6369 100644
--- 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;