Merge pull request mozilla#586 from erikvold/789605

Bug 789605 self._addonWorker is null error r=@ochameau
ochameau · Oct 4, 2012 · b3cbdfe · b3cbdfe
2 parents 4c747e8 + d7e117c
commit b3cbdfe
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/api-utils/lib/content/worker.js b/packages/api-utils/lib/content/worker.js
@@ -216,12 +216,16 @@ const WorkerSandbox = EventEmitter.compose({
 
     // self.postMessage calls
     this.on("message", function postMessage(data) {
-      self._addonWorker._emit('message', data);
+      // destroyed?
+      if (self._addonWorker)
+        self._addonWorker._emit('message', data);
     });
 
     // self.port.emit calls
     this.on("event", function portEmit(name, args) {
-      self._addonWorker._onContentScriptEvent.apply(self._addonWorker, arguments);
+      // destroyed?
+      if (self._addonWorker)
+        self._addonWorker._onContentScriptEvent.apply(self._addonWorker, arguments);
     });
 
     // Internal feature that is only used by SDK tests: