pick last active from the right end of the set

only update last active when active
brave · May 25, 2017 · 85d0fb5 · 85d0fb5
1 parent 15ac56a
commit 85d0fb5
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/app/common/state/tabState.js b/app/common/state/tabState.js
@@ -64,6 +64,10 @@ const matchTab = function (queryInfo, tab) {
 }
 
 const updateLastActive = (state, oldTabValue, newTabValue) => {
+  if (!newTabValue.get('active')) {
+    return state
+  }
+
   const oldTabId = validateId('tabId', oldTabValue.get('tabId'))
   const oldWindowId = validateId('windowId', oldTabValue.get('windowId'))
 
@@ -367,7 +371,7 @@ const tabState = {
   },
 
   getLastActiveTabId: (state, windowId) => {
-    const tabId = tabState.getTabsByLastActivated(state, windowId).slice(1, 2).first()
+    const tabId = tabState.getTabsByLastActivated(state, windowId).slice(-2).first()
     if (tabId == null) {
       return tabState.TAB_ID_NONE
     }