Fx for DFL-3256, Throws on disconnecting a remote client.

Chris K · Chris K · commit 9469c9a4846a · 2012-06-25T16:34:29.000+02:00
diff --git a/src/client/client.js b/src/client/client.js
@@ -208,8 +208,9 @@ window.cls.Client = function()
     }
     else if (is_remote_connection)
     {
-      UI.get_instance().get_button("toggle-remote-debug-overlay")
-                       .removeClass("alert");
+      var button = UI.get_instance().get_button("toggle-remote-debug-overlay");
+      if (button)
+        button.removeClass("alert");
 
       Overlay.get_instance().set_info_content(
         window.templates.remote_debug_waiting_help(port)
diff --git a/src/ui-scripts/overlay.js b/src/ui-scripts/overlay.js
@@ -69,7 +69,8 @@ var Overlay = function()
 
   this.set_info_content = function(template)
   {
-    this.info_element.clearAndRender(template);
+    if (this.info_element)
+      this.info_element.clearAndRender(template);
   };
 };
 

Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,9 @@ window.cls.Client = function()`
`208`	`208`	`}`
`209`	`209`	`else if (is_remote_connection)`
`210`	`210`	`{`
`211`		`- UI.get_instance().get_button("toggle-remote-debug-overlay")`
`212`		`- .removeClass("alert");`
	`211`	`+ var button = UI.get_instance().get_button("toggle-remote-debug-overlay");`
	`212`	`+ if (button)`
	`213`	`+ button.removeClass("alert");`
`213`	`214`
`214`	`215`	`Overlay.get_instance().set_info_content(`
`215`	`216`	`window.templates.remote_debug_waiting_help(port)`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,8 @@ var Overlay = function()`
`69`	`69`
`70`	`70`	`this.set_info_content = function(template)`
`71`	`71`	`{`
`72`		`- this.info_element.clearAndRender(template);`
	`72`	`+ if (this.info_element)`
	`73`	`+ this.info_element.clearAndRender(template);`
`73`	`74`	`};`
`74`	`75`	`};`
`75`	`76`