diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2018-11-15 21:26:00 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2018-11-15 21:26:00 +0100 |
| commit | 76ca9710507acf8b29367b11621cccb61ced8011 (patch) | |
| tree | 8218e8f48d8303b696814fc86d350ee1043b93d3 /src | |
| parent | Consistent code style (diff) | |
| download | ferdium-app-76ca9710507acf8b29367b11621cccb61ced8011.tar.gz ferdium-app-76ca9710507acf8b29367b11621cccb61ced8011.tar.zst ferdium-app-76ca9710507acf8b29367b11621cccb61ced8011.zip | |
Fix settings override
Diffstat (limited to 'src')
| -rw-r--r-- | src/electron/Settings.js | 4 |
1 files changed, 2 insertions, 2 deletions
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 { | |||
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | set(settings) { | 19 | set(settings) { |
| 20 | this.store = this._merge(this.store, settings); | 20 | this.store = this._merge(settings); |
| 21 | 21 | ||
| 22 | this._writeFile(); | 22 | this._writeFile(); |
| 23 | } | 23 | } |
| @@ -31,7 +31,7 @@ export default class Settings { | |||
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | _merge(settings) { | 33 | _merge(settings) { |
| 34 | return Object.assign(DEFAULT_APP_SETTINGS, settings); | 34 | return Object.assign(DEFAULT_APP_SETTINGS, this.store, settings); |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | _hydrate() { | 37 | _hydrate() { |