diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2017-12-15 14:44:46 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-12-15 14:44:46 +0100 |
| commit | dc1dd2e857114fac2462f18ea774ddacb287fa81 (patch) | |
| tree | 32b701de50c505abc95ceddc7c429df85c81f041 /src/stores/SettingsStore.js | |
| parent | Remove IME handlers (diff) | |
| parent | Merge pull request #475 from meetfranz/feature/service-improvements (diff) | |
| download | ferdium-app-dc1dd2e857114fac2462f18ea774ddacb287fa81.tar.gz ferdium-app-dc1dd2e857114fac2462f18ea774ddacb287fa81.tar.zst ferdium-app-dc1dd2e857114fac2462f18ea774ddacb287fa81.zip | |
Merge branch 'develop' into feature/macOS-copy-paste
Diffstat (limited to 'src/stores/SettingsStore.js')
| -rw-r--r-- | src/stores/SettingsStore.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js index 33473f16d..da99a720f 100644 --- a/src/stores/SettingsStore.js +++ b/src/stores/SettingsStore.js | |||
| @@ -26,7 +26,7 @@ export default class SettingsStore extends Store { | |||
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | @computed get all() { | 28 | @computed get all() { |
| 29 | return this.allSettingsRequest.result || new SettingsModel(); | 29 | return new SettingsModel(this.allSettingsRequest.result); |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | @action async _update({ settings }) { | 32 | @action async _update({ settings }) { |