mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

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
commit d1ea62c3e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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;
};