Bug 1356826: Wait for startup to finish before shutting down. r=me

MozReview-Commit-ID: LksftmZHI8H
2017-05-10 20:26:01 -07:00
parent 7d4d4150a7
commit 6af5fca6ce
9 changed files with 44 additions and 14 deletions
--- a/toolkit/components/extensions/extension-process-script.js
+++ b/toolkit/components/extensions/extension-process-script.js
@@ -638,9 +638,11 @@ ExtensionManager = {
        let extension = this.extensions.get(data.id);
        this.extensions.delete(data.id);

-        extension.shutdown();
+        if (extension) {
+          extension.shutdown();

-        DocumentManager.uninitExtension(extension);
+          DocumentManager.uninitExtension(extension);
+        }
        break;
      }