From 7b431e653400fb27ee051d7016f7ebbf65dac375 Mon Sep 17 00:00:00 2001
From: Jared Hirsch <ohai@6a68.net>
Date: Sat, 12 Aug 2017 12:52:48 -0700
Subject: [PATCH] Bug 1389786 - Export Screenshots 10.12.0 to Firefox; r=kmag

MozReview-Commit-ID: 1c6rq32TmOf

--HG--
extra : rebase_source : c0115e2eac57b9c18e6c2577f6b9046772c8cd76
---
 browser/extensions/screenshots/bootstrap.js               | 5 +++++
 browser/extensions/screenshots/install.rdf                | 2 +-
 browser/extensions/screenshots/webextension/manifest.json | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/browser/extensions/screenshots/bootstrap.js b/browser/extensions/screenshots/bootstrap.js
index d2525888efdd..51b09998777d 100644
--- a/browser/extensions/screenshots/bootstrap.js
+++ b/browser/extensions/screenshots/bootstrap.js
@@ -81,6 +81,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); });
 }
diff --git a/browser/extensions/screenshots/install.rdf b/browser/extensions/screenshots/install.rdf
index 15be526f6bc7..745247783fd3 100644
--- a/browser/extensions/screenshots/install.rdf
+++ b/browser/extensions/screenshots/install.rdf
@@ -12,7 +12,7 @@
       </Description>
     </em:targetApplication>
     <em:type>2</em:type>
-    <em:version>10.11.0</em:version>
+    <em:version>10.12.0</em:version>
     <em:bootstrap>true</em:bootstrap>
     <em:homepageURL>https://pageshot.net/</em:homepageURL>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>
diff --git a/browser/extensions/screenshots/webextension/manifest.json b/browser/extensions/screenshots/webextension/manifest.json
index 8a6f9180aaf3..5111421df3d6 100644
--- a/browser/extensions/screenshots/webextension/manifest.json
+++ b/browser/extensions/screenshots/webextension/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Firefox Screenshots",
-  "version": "10.11.0",
+  "version": "10.12.0",
   "description": "__MSG_addonDescription__",
   "author": "__MSG_addonAuthorsList__",
   "homepage_url": "https://github.com/mozilla-services/screenshots",