Fix #2990, avoid Invalid tab ID when an active tab is closed

The code always tries to make the icon not-active, but one case when it tries is when the tab has been closed
mozilla-services · Jun 8, 2017 · 7d1731a · 7d1731a
1 parent 03cd7be
commit 7d1731a
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/addon/webextension/background/main.js b/addon/webextension/background/main.js
@@ -55,7 +55,14 @@ this.main = (function() {
     if ((!hasSeenOnboarding) && !active) {
       path = "icons/icon-starred-32.svg";
     }
-    browser.browserAction.setIcon({path, tabId});
+    browser.browserAction.setIcon({path, tabId}).catch((error) => {
+      // FIXME: use errorCode
+      if (error.message && /Invalid tab ID/.test(error.message)) {
+        // This is a normal exception that we can ignore
+      } else {
+        catcher.unhandled(error);
+      }
+    });
   }
 
   function toggleSelector(tab) {
@@ -228,7 +235,7 @@ this.main = (function() {
   });
 
   communication.register("closeSelector", (sender) => {
-    setIconActive(false, sender.tab.id)
+    setIconActive(false, sender.tab.id);
   });
 
   catcher.watchPromise(communication.sendToBootstrap("getOldDeviceInfo").then((deviceInfo) => {