Merge pull request #9589 from evq/fix/link-hover-null-check

Add a null check for framePath in WINDOW_SET_LINK_HOVER_PREVIEW
brave · Jun 20, 2017 · 26e3fa6 · 26e3fa6
2 parents 1484eab + 09698a2
commit 26e3fa6
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -413,11 +413,16 @@ const doAction = (action) => {
         break
       }
     case windowConstants.WINDOW_SET_LINK_HOVER_PREVIEW:
-      windowState = windowState.mergeIn(frameStateUtil.activeFrameStatePath(windowState), {
-        hrefPreview: action.href,
-        showOnRight: action.showOnRight
-      })
-      break
+      {
+        const framePath = frameStateUtil.activeFrameStatePath(windowState)
+        if (framePath) {
+          windowState = windowState.mergeIn(framePath, {
+            hrefPreview: action.href,
+            showOnRight: action.showOnRight
+          })
+        }
+        break
+      }
     case windowConstants.WINDOW_SET_THEME_COLOR:
       {
         const frameKey = action.frameProps.get('key')