Fix #3323, immediately exit when Firefox is exiting

mozilla-services · Aug 11, 2017 · 916c353 · 916c353
1 parent c60fd37
commit 916c353
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/addon/bootstrap.js b/addon/bootstrap.js
@@ -139,6 +139,11 @@ function shutdown(data, reason) { // eslint-disable-line no-unused-vars
     id: ADDON_ID,
     resourceURI: addonResourceURI
   });
+  // Immediately exit if Firefox is exiting, #3323
+  if (reason === APP_SHUTDOWN) {
+    stop(webExtension, reason);
+    return;
+  }
   // Because the prefObserver is unregistered above, this _should_ terminate the promise chain.
   appStartupPromise = appStartupPromise.then(() => { stop(webExtension, reason); });
 }