Don't send a session-terminate in disconnect() if WCS not initialised.

sendIq_() requires that WCS is initialized when it is called, otherwise it will switch the session into the "failed" state.  (The state change causes a disconnect() call, which triggers a sendIq_() and the tab locks up.)


Review URL: http://codereview.chromium.org/8427020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108061 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 14 deletions

diff --git a/remoting/webapp/me2mom/client_session.js b/remoting/webapp/me2mom/client_session.js
index 9ec8b4c..1e8bfe1 100644
--- a/remoting/webapp/me2mom/client_session.js
+++ b/remoting/webapp/me2mom/client_session.js
@@ -199,22 +199,22 @@ remoting.ClientSession.prototype.removePlugin = function() {
 remoting.ClientSession.prototype.disconnect = function() {
   if (remoting.wcs) {
     remoting.wcs.setOnIq(function(stanza) {});
+    this.sendIq_(
+        '<cli:iq ' +
+            'to="' + this.hostJid + '" ' +
+            'type="set" ' +
+            'id="session-terminate" ' +
+            'xmlns:cli="jabber:client">' +
+          '<jingle ' +
+              'xmlns="urn:xmpp:jingle:1" ' +
+              'action="session-terminate" ' +
+              'initiator="' + this.clientJid + '" ' +
+              'sid="' + this.sessionId + '">' +
+            '<reason><success/></reason>' +
+          '</jingle>' +
+        '</cli:iq>');
   }
   this.removePlugin();
-  this.sendIq_(
-      '<cli:iq ' +
-          'to="' + this.hostJid + '" ' +
-          'type="set" ' +
-          'id="session-terminate" ' +
-          'xmlns:cli="jabber:client">' +
-        '<jingle ' +
-            'xmlns="urn:xmpp:jingle:1" ' +
-            'action="session-terminate" ' +
-            'initiator="' + this.clientJid + '" ' +
-            'sid="' + this.sessionId + '">' +
-          '<reason><success/></reason>' +
-        '</jingle>' +
-      '</cli:iq>');
 };
 
 /**