From 64b60c834acbe06e29f46181359d22d778ef3584 Mon Sep 17 00:00:00 2001
From: kkapsner <github@mail.kkapsner.de>
Date: Sun, 26 Jan 2020 00:51:18 +0100
Subject: [PATCH] Importing settings file with an very old storage version did
 not work at all

---
 options/options.js | 12 +++++++-----
 releaseNotes.txt   |  1 +
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/options/options.js b/options/options.js
index 464e48e..76f4cca 100644
--- a/options/options.js
+++ b/options/options.js
@@ -122,15 +122,17 @@
 				}
 			}
 			delete json.storageVersion;
-			const keys = Object.keys(json);
-			keys.forEach(function(key){
+			const keys = Object.keys(json).filter(function(key){
 				const setting = settings.getDefinition(key);
-				if (!settings){
-					throw new Error("Unknown setting " + key + ".");
+				if (!setting){
+					logging.error("Unknown setting " + key + ".");
+					return false;
 				}
 				if (!setting.fixed && setting.invalid(json[key])){
-					throw new Error("Invalid value " + json[key] + " for " + key + ".");
+					logging.error("Invalid value " + json[key] + " for " + key + ".");
+					return false;
 				}
+				return true;
 			});
 			keys.forEach(function(key){
 				settings[key] = json[key];
diff --git a/releaseNotes.txt b/releaseNotes.txt
index c73af51..fec304c 100644
--- a/releaseNotes.txt
+++ b/releaseNotes.txt
@@ -9,6 +9,7 @@ Version 1.1:
 	fixes:
 		- error when exporting function with name "top"
 		- tabs opened with window.open broke when the parent tab was reloaded/closed
+		- importing settings file with an very old storage version did not work at all
 	
 	known issues:
 		- if a data URL is blocked the page action button does not appear