check for the active frame before updating tabPage

Auditors: @bbondy fix #11028
brave · Sep 23, 2017 · 1301ad9 · 1301ad9
1 parent b051f3d
commit 1301ad9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/renderer/reducers/frameReducer.js b/app/renderer/reducers/frameReducer.js
@@ -106,9 +106,13 @@ const frameReducer = (state, action, immutableAction) => {
         state = frameStateUtil.updateFramesInternalIndex(state, Math.min(sourceFrameIndex, index))
         state = frameStateUtil.moveFrame(state, tabId, index)
 
-        // Update tab page index to the active tab in case the active tab changed
         const activeFrame = frameStateUtil.getActiveFrame(state)
-        state = frameStateUtil.updateTabPageIndex(state, activeFrame.get('tabId'))
+        // avoid the race-condition of updating the tabPage
+        // while active frame is not yet defined
+        if (activeFrame) {
+          // Update tab page index to the active tab in case the active tab changed
+          state = frameStateUtil.updateTabPageIndex(state, activeFrame.get('tabId'))
+        }
         state = frameStateUtil.setPreviewFrameKey(state, null)
       }