From 2f75f5bc7660312b6435306eba7a8628e3db39ae Mon Sep 17 00:00:00 2001
From: Brian Grinstead <bgrinstead@mozilla.com>
Date: Tue, 5 Nov 2013 07:37:55 -0600
Subject: [PATCH] Bug 934487 - Fix "TypeError: this.markup is undefined" in
 devtools b-c runs; r=pbrosset

---
 browser/devtools/inspector/inspector-panel.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/browser/devtools/inspector/inspector-panel.js b/browser/devtools/inspector/inspector-panel.js
index e07d8d5ecb3e..e55ed90095db 100644
--- a/browser/devtools/inspector/inspector-panel.js
+++ b/browser/devtools/inspector/inspector-panel.js
@@ -358,6 +358,9 @@ InspectorPanel.prototype = {
 
       this._initMarkup();
       this.once("markuploaded", () => {
+        if (this._destroyPromise) {
+          return;
+        }
         this.markup.expandNode(this.selection.nodeFront);
         this.setupSearchBox();
         this.emit("new-root");