From 1899f486e1397f72784ba0dec8a15c4b1b310900 Mon Sep 17 00:00:00 2001
From: Tamius Han <tamius.han@gmail.com>
Date: Wed, 29 Jan 2020 01:36:09 +0100
Subject: [PATCH] Settings should only watch for uwSettings storage changes,
 Logger should only monitor for uwLogger changes

---
 src/ext/lib/Logger.js   | 6 +++++-
 src/ext/lib/Settings.js | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/ext/lib/Logger.js b/src/ext/lib/Logger.js
index d8c1fcf..43914ed 100644
--- a/src/ext/lib/Logger.js
+++ b/src/ext/lib/Logger.js
@@ -16,7 +16,11 @@ class Logger {
   static syncConfig(callback) {
     const br = currentBrowser.firefox ? browser : chrome;
     br.storage.onChanged.addListener( (changes, area) => {
-      callback(JSON.parse(changes.uwLogger.newValue));
+      if (changes.uwLogger) {
+        const newLoggerConf = JSON.parse(changes.uwLogger.newValue)
+        console.info('Logger settings reloaded. New conf:', conf);
+        callback(newLoggerConf);
+      }
     });
   }
 
diff --git a/src/ext/lib/Settings.js b/src/ext/lib/Settings.js
index 30110da..2f69e25 100644
--- a/src/ext/lib/Settings.js
+++ b/src/ext/lib/Settings.js
@@ -35,6 +35,9 @@ class Settings {
   }
 
   storageChangeListener(changes, area) {
+    if (!changes.uwSettings) {
+      return;
+    }
     this.logger.log('info', 'settings', "[Settings::<storage/on change>] Settings have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area);
     if (changes['uwSettings'] && changes['uwSettings'].newValue) {
       this.logger.log('info', 'settings',"[Settings::<storage/on change>] new settings object:", JSON.parse(changes.uwSettings.newValue));