From 76ca9710507acf8b29367b11621cccb61ced8011 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Thu, 15 Nov 2018 21:26:00 +0100 Subject: Fix settings override --- src/electron/Settings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/electron') diff --git a/src/electron/Settings.js b/src/electron/Settings.js index 622d53ebc..254180b73 100644 --- a/src/electron/Settings.js +++ b/src/electron/Settings.js @@ -17,7 +17,7 @@ export default class Settings { } set(settings) { - this.store = this._merge(this.store, settings); + this.store = this._merge(settings); this._writeFile(); } @@ -31,7 +31,7 @@ export default class Settings { } _merge(settings) { - return Object.assign(DEFAULT_APP_SETTINGS, settings); + return Object.assign(DEFAULT_APP_SETTINGS, this.store, settings); } _hydrate() { -- cgit v1.2.3-54-g00ecf