Do not try to update pinned tabs in a destroyed window

Fix brave#11833
petemill · Nov 13, 2017 · 5fdf389 · 5fdf389
1 parent 64ecf51
commit 5fdf389
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/browser/windows.js b/app/browser/windows.js
@@ -73,7 +73,12 @@ const siteMatchesTab = (site, tab) => {
 }
 
 const updatePinnedTabs = (win) => {
-  if (win.webContents.browserWindowOptions.disposition === 'new-popup') {
+  // don't continue if window won't need pinned tabs updated
+  if (
+    !win ||
+    win.isDestroyed() ||
+    win.webContents.browserWindowOptions.disposition === 'new-popup'
+  ) {
     return
   }
   const appStore = require('../../js/stores/appStore')

diff --git a/test/unit/app/browser/windowsTest.js b/test/unit/app/browser/windowsTest.js
@@ -84,7 +84,8 @@ describe('window API unit tests', function () {
         browserWindowOptions: {
           disposition: ''
         }
-      }
+      },
+      isDestroyed: () => false
     }
 
     before(function () {