Avoid settings override.

mishani0x0ef · Oct 29, 2017 · aae0420 · aae0420
1 parent b7c8935
commit aae0420
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/ReportJ.Extension.Chrome/app/js/services/storageService.js b/ReportJ.Extension.Chrome/app/js/services/storageService.js
@@ -18,14 +18,11 @@ export default function StorageService(browser) {
             browser.storage.sync.get(["settings"], (storage) => {
                 const settingsExists = !isNil(storage.settings) && !isNil(storage.settings.general);
                 const defaultSettings = new GeneralSettings();
+                let settings = defaultSettings;
                 if (settingsExists) {
-                    const settings = Object.assign(defaultSettings, storage.settings.general);
-                    resolve(settings);
-                } else {
-                    const settings = { general: defaultSettings };
-                    that.saveSettings(settings);
-                    resolve(defaultSettings);
+                    settings = Object.assign(defaultSettings, storage.settings.general);
                 }
+                resolve(settings);
             });
         });
     }