Guard against empty framePath and title

This happens sometimes when dragging out / combining tabs This doesn't solve brave#10436 but it makes it less likely to happen because of some randomly encountered js errors when detaching. Auditors: @bsclifton
dfperry5 · Aug 18, 2017 · 62bd435 · 62bd435
1 parent 5f5b30d
commit 62bd435
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/app/browser/windows.js b/app/browser/windows.js
@@ -288,7 +288,7 @@ const api = {
   setTitle: (windowId, title) => {
     setImmediate(() => {
       const win = currentWindows[windowId]
-      if (win && !win.isDestroyed()) {
+      if (win && !win.isDestroyed() && title != null) {
         win.setTitle(title)
       }
     })

diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -870,11 +870,14 @@ frameShortcuts.forEach((shortcut) => {
     if (shortcut === 'toggle-dev-tools') {
       appActions.toggleDevTools(frameStateUtil.getActiveFrameTabId(windowState))
     } else {
-      windowState = windowState.mergeIn(frameStateUtil.activeFrameStatePath(windowState), {
-        activeShortcut: shortcut,
-        activeShortcutDetails: args
-      })
-      emitChanges()
+      const framePath = frameStateUtil.activeFrameStatePath(windowState)
+      if (framePath) {
+        windowState = windowState.mergeIn(framePath, {
+          activeShortcut: shortcut,
+          activeShortcutDetails: args
+        })
+        emitChanges()
+      }
     }
   })
   // Listen for actions on frame N