diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2021-01-22 12:58:59 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2021-01-22 12:58:59 +0100 |
| commit | 53cc20e5710307db90e9ca64b0e2912019f90627 (patch) | |
| tree | 66c31cd3a7d11ca593a40b34a3e8109fd59697d6 | |
| parent | 1308806aa2206082117f5f3e417fdd3d558b189d (diff) | |
| parent | a2db4d4ba6adae31d5417fea5f79846e81bc3f69 (diff) | |
| download | mullvadvpn-53cc20e5710307db90e9ca64b0e2912019f90627.tar.xz mullvadvpn-53cc20e5710307db90e9ca64b0e2912019f90627.zip | |
Merge branch 'respect-auto-connect-on-login'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | gui/src/main/gui-settings.ts | 2 | ||||
| -rw-r--r-- | gui/src/main/index.ts | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ccd686d3e5..fcdb7b37ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -43,6 +43,8 @@ Line wrap the file at 100 chars. Th - Prefer the last used API endpoint when the service starts back up, as well as in other tools such as the problem report tool. - Migrate cache to a directory readable by all users, consistent with Android and Linux. +- Change the default value of the GUI auto-connect setting to "off" and respect the setting when + logging in. #### Linux - Improve offline check to query the routing table to allow users to use a bridged adapter as their diff --git a/gui/src/main/gui-settings.ts b/gui/src/main/gui-settings.ts index 23d2e4ced8..c7f15df75e 100644 --- a/gui/src/main/gui-settings.ts +++ b/gui/src/main/gui-settings.ts @@ -15,7 +15,7 @@ const settingsSchema = { const defaultSettings: IGuiSettingsState = { preferredLocale: SYSTEM_PREFERRED_LOCALE_KEY, - autoConnect: true, + autoConnect: false, enableSystemNotifications: true, monochromaticIcon: false, startMinimized: false, diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index 95542e2cbd..cbd56f3843 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -1184,7 +1184,7 @@ class ApplicationMain { log.warn(`Failed to get account data, logging in anyway: ${verification.error.message}`); } - this.autoConnectOnWireguardKeyEvent = true; + this.autoConnectOnWireguardKeyEvent = this.guiSettings.autoConnect; await this.daemonRpc.setAccount(accountToken); // Fallback if daemon doesn't send event. |