Settings migration: Preserve future settings where possible

See discussion in #6506

1 files changed, 3 insertions, 1 deletions

diff --git a/src/gui/accountmanager.h b/src/gui/accountmanager.h
index 744bc92b5..2acce1c62 100644
--- a/src/gui/accountmanager.h
+++ b/src/gui/accountmanager.h
@@ -81,7 +81,7 @@ public:
      * Returns the list of settings keys that can't be read because
      * they are from the future.
      */
-    static QStringList backwardMigrationKeys();
+    static void backwardMigrationSettingsKeys(QStringList *deleteKeys, QStringList *ignoreKeys);
 
 private:
     // saving and loading Account to settings
@@ -111,5 +111,7 @@ Q_SIGNALS:
 private:
     AccountManager() {}
     QList<AccountStatePtr> _accounts;
+    /// Account ids from settings that weren't read
+    QSet<QString> _additionalBlockedAccountIds;
 };
 }