Merge pull request brave#9509 from brave/issue-9508

Issue 9508
NejcZdovc · Jun 20, 2017 · 1a75d4d · 1a75d4d
2 parents c43bfa4 + c1effd9
commit 1a75d4d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/browser/tabs.js b/app/browser/tabs.js
@@ -434,7 +434,7 @@ const api = {
       let tabId = tab.getId()
 
       tab.on('did-start-navigation', (e, navigationHandle) => {
-        if (navigationHandle.isValid() && navigationHandle.isInMainFrame()) {
+        if (!tab.isDestroyed() && navigationHandle.isValid() && navigationHandle.isInMainFrame()) {
           const controller = tab.controller()
           if (!controller.isValid()) {
             return
@@ -448,7 +448,7 @@ const api = {
       })
 
       tab.on('did-finish-navigation', (e, navigationHandle) => {
-        if (navigationHandle.isValid() && navigationHandle.isInMainFrame()) {
+        if (!tab.isDestroyed() && navigationHandle.isValid() && navigationHandle.isInMainFrame()) {
           const controller = tab.controller()
           if (!controller.isValid()) {
             return

diff --git a/js/state/frameStateUtil.js b/js/state/frameStateUtil.js
@@ -443,7 +443,7 @@ function getTotalBlocks (frame) {
 function isPinned (state, frameKey) {
   const frame = getFrameByKey(state, frameKey)
 
-  return !!frame.get('pinnedLocation')
+  return frame && !!frame.get('pinnedLocation')
 }
 
 /**