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

Guard against no devtools web contents

Browse source
This commit is contained in:
Kevin Sawicki 2016-12-05 16:18:53 -08:00
parent 03263bb5b6
commit 820fb3b82b
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/browser/api/browser-window.js
View file

@ -138,14 +138,17 @@ BrowserWindow.getFocusedWindow = () => {
} }
BrowserWindow.fromWebContents = (webContents) => { BrowserWindow.fromWebContents = (webContents) => {
for (let window of BrowserWindow.getAllWindows()) { for (const window of BrowserWindow.getAllWindows()) {
if (window.webContents.equal(webContents)) return window if (window.webContents.equal(webContents)) return window
} }
} }
BrowserWindow.fromDevToolsWebContents = (webContents) => { BrowserWindow.fromDevToolsWebContents = (webContents) => {
for (let window of BrowserWindow.getAllWindows()) { for (const window of BrowserWindow.getAllWindows()) {
if (window.devToolsWebContents.equal(webContents)) return window const {devToolsWebContents} = window
if (devToolsWebContents != null && devToolsWebContents.equal(webContents)) {
return window
}
} }
} }