From a27822b5576382f8a7a2825cf37108d6c4df9d92 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Tue, 4 Jan 2022 16:48:17 +0200 Subject: [PATCH 1/2] Correct the order of the migrated settings' mappings --- src/app/upgrade.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/upgrade.cpp b/src/app/upgrade.cpp index 3308d523f..406f0ebc1 100644 --- a/src/app/upgrade.cpp +++ b/src/app/upgrade.cpp @@ -233,8 +233,8 @@ namespace { struct KeyMapping { - QString oldKey; QString newKey; + QString oldKey; }; const KeyMapping mappings[] = From 702c79a92fe866b976ba0fe07b6dd5604c12969f Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Wed, 5 Jan 2022 01:01:10 +0200 Subject: [PATCH 2/2] Don't delete old config keys yet It will allow users to go back to previous versions without losing their settings. --- src/app/upgrade.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/upgrade.cpp b/src/app/upgrade.cpp index 406f0ebc1..9ae11b7ad 100644 --- a/src/app/upgrade.cpp +++ b/src/app/upgrade.cpp @@ -322,7 +322,7 @@ namespace { const auto value = settingsStorage->loadValue(mapping.oldKey); settingsStorage->storeValue(mapping.newKey, value); - settingsStorage->removeValue(mapping.oldKey); + // TODO: Remove oldKey after ~v4.4.3 and bump migration version } } }