From 96f86f766f911451f6099464f0551b3c1aafaea7 Mon Sep 17 00:00:00 2001
From: nobody <info@localcdn.org>
Date: Tue, 24 Oct 2023 06:23:10 +0200
Subject: [PATCH] Improve handling empty variables (#1510)

---
 pages/options/options-other.js | 6 +++++-
 pages/options/options.js       | 2 +-
 pages/popup/popup.js           | 4 +++-
 pages/updates/updates.html     | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/pages/options/options-other.js b/pages/options/options-other.js
index f5414b5a..7f0ef3cd 100644
--- a/pages/options/options-other.js
+++ b/pages/options/options-other.js
@@ -34,7 +34,11 @@ optionsOther._renderIconSection = function (opt) {
         return;
     }
 
-    selectedIcon = opt.selectedIcon;
+    if (opt.selectedIcon === null || opt.selectedIcon === undefined) {
+        selectedIcon = 'Default';
+    } else {
+        selectedIcon = opt.selectedIcon;
+    }
 
     if (selectedIcon === 'Default') {
         document.getElementById('icon-default').checked = true;
diff --git a/pages/options/options.js b/pages/options/options.js
index 0bdc530d..5eb95882 100644
--- a/pages/options/options.js
+++ b/pages/options/options.js
@@ -196,7 +196,7 @@ options._configureLinkPrefetching = function (value) {
 };
 
 options._serializeAllowlistedDomains = function (allowlistedDomains) {
-    if (allowlistedDomains === undefined) {
+    if (allowlistedDomains === undefined || allowlistedDomains === null) {
         return '';
     }
 
diff --git a/pages/popup/popup.js b/pages/popup/popup.js
index f9ff9ffa..975b08a0 100644
--- a/pages/popup/popup.js
+++ b/pages/popup/popup.js
@@ -295,7 +295,9 @@ popup._determineStatusGoogleFonts = function () {
         };
 
         chrome.runtime.sendMessage(message, function (response) {
-            popup._domainGoogleFonts = response.value;
+            if (response !== undefined) {
+                popup._domainGoogleFonts = response.value;
+            }
             resolve();
         });
     });
diff --git a/pages/updates/updates.html b/pages/updates/updates.html
index ef7df0e9..8373bad7 100644
--- a/pages/updates/updates.html
+++ b/pages/updates/updates.html
@@ -28,6 +28,7 @@
                         <p>Improved</p>
                         <ul>
                             <li>Allow Google fonts for Google services by default and permanently (<a href="https://codeberg.org/nobody/LocalCDN/issues/1560">#1560</a>)</li>
+                            <li>Firefox Sync (<a href="https://codeberg.org/nobody/LocalCDN/issues/1510">#1510</a>)</li>
                         </ul>
                     </div>
                     <div id="generator-section">