github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-09 15:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: getting focused window with destroyed webContents (#33404)

Browse Source 
* fix: getting focused window with destroyed webContents

* fix: add extra safeguards
This commit is contained in:
Shelley Vohr
2022-03-29 18:22:58 +02:00
committed by GitHub
parent 8ea0631b82
commit d1ea62c3e8
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/browser/api/browser-window.ts
View File

@@ -72,7 +72,10 @@ BrowserWindow.getAllWindows = () => {
BrowserWindow.getFocusedWindow = () => {
for (const window of BrowserWindow.getAllWindows()) {
if (window.isFocused() || window.isDevToolsFocused()) return window;
const hasWC = window.webContents && !window.webContents.isDestroyed();
if (!window.isDestroyed() && hasWC) {
if (window.isFocused() || window.isDevToolsFocused()) return window;
}
}
return null;
};