From 556f537f70fd27ef96d17fae65f99fbe62811059 Mon Sep 17 00:00:00 2001
From: ManeraKai <manerakai@protonmail.com>
Date: Sun, 5 Jun 2022 20:10:42 +0300
Subject: Adding weblate. Changing small things

---
 src/pages/background/background.js   |  6 ++++--
 src/pages/options/widgets/general.js | 11 ++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/pages')

diff --git a/src/pages/background/background.js b/src/pages/background/background.js
index afb63c51..c5f1718d 100644
--- a/src/pages/background/background.js
+++ b/src/pages/background/background.js
@@ -24,8 +24,10 @@ window.browser = window.browser || window.chrome;
 function openResetWarning() {
   return new Promise(resolve => {
     browser.storage.local.get(null, r => {
-      const old = encodeURIComponent(JSON.stringify(r))
-      browser.tabs.create({ url: browser.runtime.getURL(`/pages/background/reset_warning.html?data=${old}`) });
+      if (r.theme) {
+        const old = encodeURIComponent(JSON.stringify(r))
+        browser.tabs.create({ url: browser.runtime.getURL(`/pages/background/reset_warning.html?data=${old}`) });
+      }
       resolve();
     })
   })
diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js
index f46c4011..a66e3b47 100644
--- a/src/pages/options/widgets/general.js
+++ b/src/pages/options/widgets/general.js
@@ -87,16 +87,21 @@ importSettingsElement.addEventListener("change",
                 await redditHelper.pasteTedditCookies();
 
                 await tiktokHelper.pasteProxiTokCookies();
-                
+
                 location.reload();
               })
 
           });
 
-      } else
+      } else {
+        console.log('incompatible settings');
         importError()
+      }
     }
-    reader.onerror = error => importError();
+    reader.onerror = error => {
+      console.log('error', error);
+      importError()
+    };
   }
 );
 function importError() {
-- 
cgit 1.4.1