summaryrefslogtreecommitdiffhomepage
path: root/gui/src
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2021-01-20 18:12:43 +0100
committerOskar Nyberg <oskar@mullvad.net>2021-01-20 18:12:43 +0100
commita992519ec9545134bc53046567466670e53be0c9 (patch)
tree4a898b8e69c66ab0aaaca36ee067449083bcaa74 /gui/src
parent9cc619fc3b63721f95d008922dde98e78772f7a1 (diff)
parentfd471eb79820ed3338106212407e8cfb8394ac7e (diff)
downloadmullvadvpn-a992519ec9545134bc53046567466670e53be0c9.tar.xz
mullvadvpn-a992519ec9545134bc53046567466670e53be0c9.zip
Merge branch 'save-gui-settings-immediately'
Diffstat (limited to 'gui/src')
-rw-r--r--gui/src/main/gui-settings.ts8
1 files changed, 7 insertions, 1 deletions
diff --git a/gui/src/main/gui-settings.ts b/gui/src/main/gui-settings.ts
index 54b51116cd..23d2e4ced8 100644
--- a/gui/src/main/gui-settings.ts
+++ b/gui/src/main/gui-settings.ts
@@ -90,7 +90,13 @@ export default class GuiSettings {
...this.validateSettings(rawJson),
};
} catch (error) {
- log.error(`Failed to read GUI settings file: ${error}`);
+ // Read settings if the file exists, otherwise write the default settings to it.
+ if (error.code === 'ENOENT') {
+ log.debug('Creating gui-settings file and writing the default settings to it');
+ this.store();
+ } else {
+ log.error(`Failed to read GUI settings file: ${error}`);
+ }
}
}