Merge pull request #205 from toasted-nutbread/settings-improvements2

Settings improvements part 2

1 files changed, 10 insertions, 5 deletions

diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index 69c662e6..d093d0b4 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -330,7 +330,7 @@ function optionsLoad() {
     }).then(optionsStr => {
         if (typeof optionsStr === 'string') {
             const options = JSON.parse(optionsStr);
-            if (typeof options === 'object' && options !== null && !Array.isArray(options)) {
+            if (utilIsObject(options)) {
                 return options;
             }
         }
@@ -343,9 +343,14 @@ function optionsLoad() {
 }
 
 function optionsSave(options) {
-    return new Promise((resolve) => {
-        chrome.storage.local.set({options: JSON.stringify(options)}, resolve);
-    }).then(() => {
-        utilBackend().onOptionsUpdated(options);
+    return new Promise((resolve, reject) => {
+        chrome.storage.local.set({options: JSON.stringify(options)}, () => {
+            const error = chrome.runtime.lastError;
+            if (error) {
+                reject(error);
+            } else {
+                resolve();
+            }
+        });
     });
 }