Browse Source

Guard against no devtools web contents

Kevin Sawicki 8 years ago
parent
commit
820fb3b82b
1 changed files with 6 additions and 3 deletions
  1. 6 3
      lib/browser/api/browser-window.js

+ 6 - 3
lib/browser/api/browser-window.js

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