From b5e0a297d83035c371758131fd0182afa2115ff0 Mon Sep 17 00:00:00 2001 From: Hygna Date: Mon, 17 Oct 2022 16:32:19 +0100 Subject: Remove instances not in the redirects list from the enabled list Closes https://github.com/libredirect/libredirect/issues/489 --- src/pages/options/widgets/general.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/pages/options/widgets') diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js index 164d9b89..bcc9afed 100644 --- a/src/pages/options/widgets/general.js +++ b/src/pages/options/widgets/general.js @@ -29,11 +29,6 @@ async function getConfig() { } function setOption(option, type, event) { - browser.storage.local.get("options", r => { - let options = r.options - browser.storage.local.set({ options }) - }) - browser.storage.local.get("options", r => { let options = r.options if (type == "select") { @@ -82,13 +77,20 @@ importSettingsElement.addEventListener("change", () => { await generalHelper.initDefaults() await servicesHelper.initDefaults() await servicesHelper.upgradeOptions() + await servicesHelper.processEnabledInstanceList() location.reload() }) }) }) ) - } else if ("version" in data) browser.storage.local.set({ options: data }, () => location.reload()) - else { + } else if ("version" in data) { + let options = data + delete options.version + browser.storage.local.set({ options: data }, async () => { + await servicesHelper.processEnabledInstanceList() + location.reload() + }) + } else { console.log("incompatible settings") importError() } -- cgit 1.4.1