Bug 833783: followup, fix exception when calling destroy multiple times.

mozilla · Feb 11, 2013 · d4556ce · d4556ce
1 parent b06eb5b
commit d4556ce
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/sdk/tabs/tab-firefox.js b/lib/sdk/tabs/tab-firefox.js
@@ -57,9 +57,11 @@ const TabTrait = Trait.compose(EventEmitter, {
   },
   destroy: function destroy() {
     this._removeAllListeners();
-    this._browser.removeEventListener(EVENTS.ready.dom, this._onReady, true);
-    this._tab = null;
-    TABS.splice(TABS.indexOf(this), 1);
+    if (this._tab) {
+      this._browser.removeEventListener(EVENTS.ready.dom, this._onReady, true);
+      this._tab = null;
+      TABS.splice(TABS.indexOf(this), 1);
+    }
   },
 
   /**

diff --git a/test/test-tab.js b/test/test-tab.js
@@ -121,6 +121,10 @@ exports["test behavior on close"] = function(assert, done) {
                      "After being closed, tab attributes are undefined (url)");
         assert.equal(tab.index, undefined,
                      "After being closed, tab attributes are undefined (index)");
+        // Ensure that we can call destroy multiple times without throwing
+        tab.destroy();
+        tab.destroy();
+
         done();
       });
     }