Load host settings in connect_ to ensure they are valid for every connection.

remoting/webapp/crd/js/me2me_activity.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 (function() {
 
 'use strict';
@@ skipping 56 matching lines @@
       remoting.setMode(remoting.AppMode.HOME);
       that.logger_.logSessionStateChange(
           Event.SessionState.CONNECTION_CANCELED);
     } else {
       that.logger_.logSessionStateChange(
           Event.SessionState.CONNECTION_FAILED, error);
       that.showErrorMessage_(error);
     }
   }
 
-  this.hostUpdateDialog_.showIfNecessary(webappVersion).then(function() {
-    return that.host_.options.load();
-  }).catch(remoting.Error.handler(function(/** remoting.Error */ error) {
-    // User cancels out of the Host upgrade dialog.  Report it as bad version.
-    throw new remoting.Error(remoting.Error.Tag.BAD_VERSION);
+  this.hostUpdateDialog_.showIfNecessary(webappVersion).catch(
+      remoting.Error.handler(function(/** remoting.Error */ error) {
+        // User cancels the Host upgrade dialog.  Report it as bad version.
+        throw new remoting.Error(remoting.Error.Tag.BAD_VERSION);
   })).then(
     this.gnubbyAuthHandler_.isGnubbyExtensionInstalled.bind(
         this.gnubbyAuthHandler_)
   ).then(
     function (extensionInstalled) {
       if (extensionInstalled) {
         this.additionalCapabilities_.push(
             remoting.ClientSession.Capability.SECURITY_KEY);
       }
     }.bind(this)
@@ skipping 45 matching lines @@
 
 /**
  * @private
  */
 remoting.Me2MeActivity.prototype.connect_ = function() {
   base.dispose(this.desktopActivity_);
 
   this.desktopActivity_ = new remoting.DesktopRemotingActivity(
       this, this.logger_, this.additionalCapabilities_);
   this.desktopActivity_.getConnectingDialog().show();
-  this.desktopActivity_.start(this.host_, this.createCredentialsProvider_());
+  this.host_.options.load().then(
+    function() {
+      this.desktopActivity_.start(this.host_,
+                                    this.createCredentialsProvider_());
+    }.bind(this));
 };
 
 /**
  * @return {remoting.CredentialsProvider}
  * @private
  */
 remoting.Me2MeActivity.prototype.createCredentialsProvider_ = function() {
   var host = this.host_;
   var that = this;
 
@@ skipping 46 matching lines @@
 remoting.Me2MeActivity.prototype.reconnectOnHostOffline_ = function(error) {
   var that = this;
   var onHostListRefresh = function() {
     var host = that.hostList_.getHostForId(that.host_.hostId);
     var SessionEntryPoint = remoting.ChromotingEvent.SessionEntryPoint;
 
     // Reconnect if the host's JID changes.
     if (Boolean(host) &&
         host.jabberId != that.host_.jabberId &&
         host.status == 'ONLINE') {
       that.host_ = host;

[Jamie, 2016/03/04 19:46:24]

This is the offending line. An alternative fix would be just to update the
jabberId, but I think what I've done is more robust.

       that.reconnect_(SessionEntryPoint.AUTO_RECONNECT_ON_HOST_OFFLINE);
       return;
     }
     that.showErrorMessage_(error);
   };
 
   this.retryOnHostOffline_ = false;
   // The plugin will be re-created when the host list has been refreshed.
   this.hostList_.refreshAndDisplay().then(
     onHostListRefresh
@@ skipping 247 matching lines @@
 };
 
 remoting.AutoReconnector.prototype.dispose = function() {
   base.dispose(this.networkDetector_);
   this.networkDetector_ = null;
   this.reconnectCallback_ = null;
   this.connectingDialog_.hide();
 };
 
 })();