Merge remote-tracking branch 'origin/dev' into release-candidate

UWNetworksLab · Aug 31, 2015 · ff1a034 · ff1a034
2 parents 267d6b9 + 8412071
commit ff1a034
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/generic_ui/scripts/ui.ts b/src/generic_ui/scripts/ui.ts
@@ -590,12 +590,20 @@ export class UserInterface implements ui_constants.UiApi {
 
     if (instanceId) {
       this.mapInstanceIdToUser_[instanceId].isSharingWithMe = false;
-      if (data.error) {
-        this.bringUproxyToFront();
-        this.core.disconnectedWhileProxying = instanceId;
+    }
+
+    if (data.error) {
+      if (instanceId) {
         // Auto-retry.
+        this.core.disconnectedWhileProxying = instanceId;
         this.restartProxying();
+      } else {
+        // this handles the case where it was a one-time connection
+        this.core.disconnectedWhileProxying = 'unknown';
       }
+
+      // regardless, let the user know
+      this.bringUproxyToFront();
     }
 
     this.updateGettingStatusBar_();