summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-01-22 12:58:59 +0100
committerOskar Nyberg <oskar@mullvad.net>2021-01-22 12:58:59 +0100
commit53cc20e5710307db90e9ca64b0e2912019f90627 (patch)
tree66c31cd3a7d11ca593a40b34a3e8109fd59697d6 /gui/src
parent1308806aa2206082117f5f3e417fdd3d558b189d (diff)
parenta2db4d4ba6adae31d5417fea5f79846e81bc3f69 (diff)
downloadmullvadvpn-53cc20e5710307db90e9ca64b0e2912019f90627.tar.xz
mullvadvpn-53cc20e5710307db90e9ca64b0e2912019f90627.zip
Merge branch 'respect-auto-connect-on-login'
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/main/gui-settings.ts2
-rw-r--r--gui/src/main/index.ts2
2 files changed, 2 insertions, 2 deletions
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.