Merge branch 'fix-change-window-type-autoconnect'

1 files changed, 1 insertions, 27 deletions

diff --git a/gui/src/renderer/app.tsx b/gui/src/renderer/app.tsx
index 54f843a6e0..5cb32d3517 100644
--- a/gui/src/renderer/app.tsx
+++ b/gui/src/renderer/app.tsx
@@ -121,7 +121,6 @@ export default class AppRenderer {
   private tunnelState!: TunnelState;
   private settings!: ISettings;
   private guiSettings!: IGuiSettingsState;
-  private autoConnected = false;
   private doingLogin = false;
   private loginScheduler = new Scheduler();
   private connectedToDaemon = false;
@@ -646,9 +645,8 @@ export default class AppRenderer {
     }
   }
 
-  private async onDaemonConnected() {
+  private onDaemonConnected() {
     this.connectedToDaemon = true;
-    await this.autoConnect();
     this.resetNavigation();
   }
 
@@ -698,30 +696,6 @@ export default class AppRenderer {
     }
   }
 
-  private async autoConnect() {
-    if (window.env.development) {
-      log.info('Skip autoconnect in development');
-    } else if (this.autoConnected) {
-      log.info('Skip autoconnect because it was done before');
-    } else if (this.settings.accountToken) {
-      if (this.guiSettings.autoConnect) {
-        try {
-          log.info('Autoconnect the tunnel');
-
-          await this.connectTunnel();
-
-          this.autoConnected = true;
-        } catch (error) {
-          log.error(`Failed to autoconnect the tunnel: ${error.message}`);
-        }
-      } else {
-        log.info('Skip autoconnect because GUI setting is disabled');
-      }
-    } else {
-      log.info('Skip autoconnect because account token is not set');
-    }
-  }
-
   private setAccountHistory(accountHistory?: AccountToken) {
     this.reduxActions.account.updateAccountHistory(accountHistory);
   }