diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-12-11 08:12:00 -0200 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-01-15 06:43:35 -0200 |
| commit | 9c20fc0969ed362d7d88fd5aa9b6e2401e205deb (patch) | |
| tree | a5371bbae4d8ac4d4b7d26d41e1fb841c37417b1 /gui/packages | |
| parent | 8f81b3b91ab0168d7a1499010125039ea7b2564b (diff) | |
| download | mullvadvpn-9c20fc0969ed362d7d88fd5aa9b6e2401e205deb.tar.xz mullvadvpn-9c20fc0969ed362d7d88fd5aa9b6e2401e205deb.zip | |
Don't auto-connect when option is unset
Diffstat (limited to 'gui/packages')
| -rw-r--r-- | gui/packages/desktop/src/renderer/app.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gui/packages/desktop/src/renderer/app.js b/gui/packages/desktop/src/renderer/app.js index 5d0050f420..0fd60d99ee 100644 --- a/gui/packages/desktop/src/renderer/app.js +++ b/gui/packages/desktop/src/renderer/app.js @@ -451,15 +451,17 @@ export default class AppRenderer { const accountToken = this._settings.accountToken; if (accountToken) { - if (process.env.NODE_ENV !== 'development') { + if (process.env.NODE_ENV === 'development') { + log.debug('Skip autoconnect in development'); + } else if (!this._getAutoConnect()) { + log.debug('Skip autoconnect because GUI setting is disabled'); + } else { try { log.debug('Autoconnect the tunnel'); await this.connectTunnel(); } catch (error) { log.error(`Failed to autoconnect the tunnel: ${error.message}`); } - } else { - log.debug('Skip autoconnect in development'); } } else { log.debug('Skip autoconnect because account token is not set'); |