Bug 783393 - Breakpoints not getting caught on reload; r=dcamp, a=lsb…

…lakk
mozilla · Aug 21, 2012 · 56b110d · 56b110d
1 parent 7627459
commit 56b110d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js
@@ -156,7 +156,7 @@ let DebuggerController = {
 
     let client = this.client = new DebuggerClient(transport);
 
-    client.addListener("tabNavigated", this._onTabNavigated);
+    client.addListener("tabNavigated", this._onTabDetached);
     client.addListener("tabDetached", this._onTabDetached);
 
     client.connect(function(aType, aTraits) {
@@ -172,7 +172,7 @@ let DebuggerController = {
    * Closes the debugger client and removes event handlers as necessary.
    */
   _disconnect: function DC__disconnect() {
-    this.client.removeListener("tabNavigated", this._onTabNavigated);
+    this.client.removeListener("tabNavigated", this._onTabDetached);
     this.client.removeListener("tabDetached", this._onTabDetached);
     this.client.close();
 
@@ -484,7 +484,7 @@ StackFrames.prototype = {
    * Called soon after the thread client's framescleared notification.
    */
   _afterFramesCleared: function SF__afterFramesCleared() {
-    if (!this.activeThread.cachedFrames.length) {
+    if (this.activeThread && !this.activeThread.cachedFrames.length) {
       DebuggerView.StackFrames.emptyText();
       DebuggerView.Properties.emptyText();
       DebuggerController.dispatchEvent("Debugger:AfterFramesCleared");

diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in
@@ -42,7 +42,7 @@ _BROWSER_TEST_FILES = \
 	browser_dbg_stack-03.js \
 	browser_dbg_stack-04.js \
 	browser_dbg_stack-05.js \
-	browser_dbg_location-changes.js \
+	$(warning browser_dbg_location-changes.js temporarily disabled on BETA due to bug 783393) \
 	browser_dbg_script-switching.js \
 	browser_dbg_scripts-sorting.js \
 	browser_dbg_scripts-searching-01.js \
@@ -58,7 +58,7 @@ _BROWSER_TEST_FILES = \
 	browser_dbg_pause-exceptions.js \
 	browser_dbg_multiple-windows.js \
 	browser_dbg_menustatus.js \
-	browser_dbg_bfcache.js \
+	$(warning browser_dbg_bfcache.js temporarily disabled on BETA due to bug 783393) \
 	head.js \
 	$(NULL)