don’t call doAction inside doAction because it has the potential to l…

…ose updates fix #6791
brave · Jan 27, 2017 · 7968884 · 7968884
1 parent df3a212
commit 7968884
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -518,10 +518,10 @@ const doAction = (action) => {
           (action.frameProps.get('partitionNumber') || 0) === (frame.get('partitionNumber') || 0))
       if (alreadyPinnedFrameProps && action.isPinned) {
         action.actionType = windowConstants.WINDOW_CLOSE_FRAME
-        doAction(action)
+        setImmediate(() => { doAction(Object.assign({}, action)) })
         action.actionType = windowConstants.WINDOW_SET_ACTIVE_FRAME
         action.frameProps = alreadyPinnedFrameProps
-        doAction(action)
+        setImmediate(() => { doAction(Object.assign({}, action)) })
       } else {
         windowState = windowState.setIn(['frames', frameStateUtil.getFramePropsIndex(windowState.get('frames'), action.frameProps), 'pinnedLocation'],
           action.isPinned ? location : undefined)
@@ -689,14 +689,14 @@ const doAction = (action) => {
       break
     case windowConstants.WINDOW_TOGGLE_MENUBAR_VISIBLE:
       if (getSetting(settings.AUTO_HIDE_MENU)) {
-        doAction({actionType: windowConstants.WINDOW_SET_CONTEXT_MENU_DETAIL})
+        setImmediate(() => { doAction({actionType: windowConstants.WINDOW_SET_CONTEXT_MENU_DETAIL}) })
         // Use value if provided; if not, toggle to opposite.
         const newVisibleStatus = typeof action.isVisible === 'boolean'
           ? action.isVisible
           : !windowState.getIn(['ui', 'menubar', 'isVisible'])
         // Clear selection when menu is shown
         if (newVisibleStatus) {
-          doAction({ actionType: windowConstants.WINDOW_SET_MENUBAR_SELECTED_INDEX, index: 0 })
+          setImmediate(() => { doAction({ actionType: windowConstants.WINDOW_SET_MENUBAR_SELECTED_INDEX, index: 0 }) })
         }
         windowState = windowState.setIn(['ui', 'menubar', 'isVisible'], newVisibleStatus)
       }
@@ -708,16 +708,16 @@ const doAction = (action) => {
       }
       break
     case windowConstants.WINDOW_RESET_MENU_STATE:
-      doAction({actionType: windowConstants.WINDOW_SET_POPUP_WINDOW_DETAIL})
-      doAction({actionType: windowConstants.WINDOW_HIDE_BOOKMARK_HANGER})
+      setImmediate(() => { doAction({actionType: windowConstants.WINDOW_SET_POPUP_WINDOW_DETAIL}) })
+      setImmediate(() => { doAction({actionType: windowConstants.WINDOW_HIDE_BOOKMARK_HANGER}) })
       if (getSetting(settings.AUTO_HIDE_MENU)) {
-        doAction({actionType: windowConstants.WINDOW_TOGGLE_MENUBAR_VISIBLE, isVisible: false})
+        setImmediate(() => { doAction({actionType: windowConstants.WINDOW_TOGGLE_MENUBAR_VISIBLE, isVisible: false}) })
       } else {
-        doAction({actionType: windowConstants.WINDOW_SET_CONTEXT_MENU_DETAIL})
+        setImmediate(() => { doAction({actionType: windowConstants.WINDOW_SET_CONTEXT_MENU_DETAIL}) })
       }
-      doAction({actionType: windowConstants.WINDOW_SET_MENUBAR_SELECTED_INDEX})
-      doAction({actionType: windowConstants.WINDOW_SET_CONTEXT_MENU_SELECTED_INDEX})
-      doAction({actionType: windowConstants.WINDOW_SET_BOOKMARKS_TOOLBAR_SELECTED_FOLDER_ID})
+      setImmediate(() => { doAction({actionType: windowConstants.WINDOW_SET_MENUBAR_SELECTED_INDEX}) })
+      setImmediate(() => { doAction({actionType: windowConstants.WINDOW_SET_CONTEXT_MENU_SELECTED_INDEX}) })
+      setImmediate(() => { doAction({actionType: windowConstants.WINDOW_SET_BOOKMARKS_TOOLBAR_SELECTED_FOLDER_ID}) })
       break
     case windowConstants.WINDOW_SET_MENUBAR_SELECTED_INDEX:
       windowState = windowState.setIn(['ui', 'menubar', 'selectedIndex'], action.index)