mozilla-central: changeset 243284:9a92b9861865b79981b36f89e99ae98760151d45

author	Carsten "Tomcat" Book <cbook@mozilla.com>
	Mon, 11 May 2015 14:06:57 +0200
changeset 243284	9a92b9861865b79981b36f89e99ae98760151d45
parent 243283	d73345efa2be523d8fc9b6803856369e31eb010a
child 243285	8d78c47be72c22fdf242a028b3d80c77000771d4
push id	28736
push user	cbook@mozilla.com
push date	Tue, 12 May 2015 10:01:42 +0000
treeherder	mozilla-central@0ca37b3cb73d [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	1150052
milestone	40.0a1
backs out	8f25a6b0d8028424de401c2060a07ddc92737298
first release with	nightly linux32 62d9b117c688 / 41.0a1 / 20150513030209 / files nightly linux64 62d9b117c688 / 41.0a1 / 20150513030209 / files nightly mac 62d9b117c688 / 41.0a1 / 20150513030209 / files nightly win32 62d9b117c688 / 41.0a1 / 20150513030209 / files nightly win64 62d9b117c688 / 41.0a1 / 20150513030209 / files
last release without	nightly linux32 d8420a541d1c / 40.0a1 / 20150511030203 / files nightly linux64 d8420a541d1c / 40.0a1 / 20150511030203 / files nightly mac d8420a541d1c / 40.0a1 / 20150511030203 / files nightly win32 d8420a541d1c / 40.0a1 / 20150511030203 / files nightly win64 d8420a541d1c / 40.0a1 / 20150511030203 / files

--- a/browser/base/content/socialchat.xml
+++ b/browser/base/content/socialchat.xml
@@ -550,17 +550,18 @@
       <method name="openChat">
         <parameter name="aOrigin"/>
         <parameter name="aTitle"/>
         <parameter name="aURL"/>
         <parameter name="aMode"/>
         <parameter name="aCallback"/>
         <body><![CDATA[
           let cb = this.chatboxForURL.get(aURL);
-          if (cb && cb = cb.get()) {
+          if (cb) {
+            cb = cb.get();
             // A chatbox is still alive to us when it's parented and still has
             // content.
             if (cb.parentNode && cb.contentWindow) {
               this.showChat(cb, aMode);
               if (aCallback) {
                 if (cb._callbacks == null) {
                   // Chatbox has already been created, so callback now.
                   aCallback(cb);