Update background.js

getLastFocused returns wrong window with Chrome v46, see #312
greatsuspender · Oct 16, 2015 · a21202e · a21202e
1 parent 44ba1b8
commit a21202e
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/src/js/background.js b/src/js/background.js
@@ -215,11 +215,15 @@ var tgs = (function () {
     }
 
     function suspendAllTabs() {
-        chrome.windows.getLastFocused({populate: true}, function(curWindow) {
-            curWindow.tabs.forEach(function (tab) {
-                if (!tab.active) {
-                    requestTabSuspension(tab, true);
-                }
+        chrome.tabs.query({ active: true, currentWindow: true }, function(a)
+        {
+            var windowID = a[0].windowId;
+            chrome.windows.get(windowID, {populate: true}, function(curWindow) {
+                curWindow.tabs.forEach(function (tab) {
+                    if (!tab.active) {
+                        requestTabSuspension(tab, true);
+                    }
+                });
             });
         });
     }
@@ -229,12 +233,15 @@ var tgs = (function () {
     }
 
     function unsuspendAllTabs() {
-
-        chrome.windows.getLastFocused({populate: true}, function(curWindow) {
-            curWindow.tabs.forEach(function (currentTab) {
-                if (isSuspended(currentTab)) {
-                    unsuspendTab(currentTab);
-                }
+        chrome.tabs.query({ active: true, currentWindow: true }, function(a)
+        {
+            var windowID = a[0].windowId;
+            chrome.windows.get(windowID, {populate: true}, function(curWindow) {
+                curWindow.tabs.forEach(function (currentTab) {
+                    if (isSuspended(currentTab)) {
+                        unsuspendTab(currentTab);
+                    }
+                });
             });
         });
     }