linter

jakearchibald · Nov 11, 2021 · 430863b · 430863b
1 parent 1a82f3e
commit 430863b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/js/page/main-controller.js b/src/js/page/main-controller.js
@@ -251,8 +251,8 @@ export default class MainController {
 
   async _loadSettings() {
     const settings = {
-      ...await storage.get('settings'),
-      ...this._settingsUi.getSettingsOverride()
+      ...(await storage.get('settings')),
+      ...this._settingsUi.getSettingsOverride(),
     };
     if (settings) this._settingsUi.setSettings(settings);
   }

diff --git a/src/js/page/ui/settings.js b/src/js/page/ui/settings.js
@@ -47,7 +47,7 @@ export default class Settings {
       });
 
       const settingsOverride = this.getSettingsOverride();
-      settingsOverride && this.setSettings(settingsOverride);
+      if (settingsOverride) this.setSettings(settingsOverride);
     });
   }
 
@@ -97,7 +97,7 @@ export default class Settings {
     }
 
     const settingsOverride = this.getSettingsOverride();
-    settingsOverride && this.setSettings(settingsOverride);
+    if (settingsOverride) this.setSettings(settingsOverride);
 
     this.emitter.emit('reset', oldSettings);
     this.emitter.emit('change');