Bug 1357486: Follow-up: Fix error on shutdown after incomplete startup.
authorKris Maglione <maglione.k@gmail.com>
Sun, 09 Jul 2017 15:32:18 -0700
changeset 606114 bafb677d3d3c40cb824ef591a5bd096291ee373a
parent 606113 b7c72fa8ccd849c4cc09ca1994b6e22b5ea4bc17
child 606115 bb0994ed7a97f4886135aae13a84a1fe22786825
child 608640 367512a1947638dd4993e5f5ad9503c0c110374d
push id67608
push userkgupta@mozilla.com
push dateMon, 10 Jul 2017 11:23:08 +0000
bugs1357486
milestone56.0a1
Bug 1357486: Follow-up: Fix error on shutdown after incomplete startup. MozReview-Commit-ID: Fgs3fWc2ylF
toolkit/components/extensions/Extension.jsm
--- a/toolkit/components/extensions/Extension.jsm
+++ b/toolkit/components/extensions/Extension.jsm
@@ -1163,17 +1163,17 @@ this.Extension = class extends Extension
       file.remove(false);
     }).catch(Cu.reportError);
   }
 
   async shutdown(reason) {
     let promise = this._shutdown(reason);
 
     AsyncShutdown.profileChangeTeardown.addBlocker(
-      `Extension Shutdown: ${this.id} (${this.name})`,
+      `Extension Shutdown: ${this.id} (${this.manifest && this.name})`,
       promise.catch(() => {}));
 
     let cleanup = () => {
       shutdownPromises.delete(this.id);
     };
     shutdownPromises.set(this.id, promise.then(cleanup, cleanup));
 
     return Promise.resolve(promise);