From e7ebbffbfd229b50c07fe04f6324f3ab9ed9b32d Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Thu, 23 Dec 2021 14:36:19 +0800
Subject: [PATCH] Set appropriate migration version number for new
 installations

---
 src/app/main.cpp    | 3 ++-
 src/app/upgrade.cpp | 8 +++++++-
 src/app/upgrade.h   | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 7406545b4..df6c4ee5f 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -188,7 +188,6 @@ int main(int argc, char *argv[])
 #ifndef DISABLE_GUI
             if (!userAgreesWithLegalNotice())
                 return EXIT_SUCCESS;
-
 #elif defined(Q_OS_WIN)
             if (_isatty(_fileno(stdin))
                 && _isatty(_fileno(stdout))
@@ -201,6 +200,8 @@ int main(int argc, char *argv[])
                 && !userAgreesWithLegalNotice())
                 return EXIT_SUCCESS;
 #endif
+
+            setCurrentMigrationVersion();
         }
 
         // Check if qBittorrent is already running for this user
diff --git a/src/app/upgrade.cpp b/src/app/upgrade.cpp
index 6565bde16..71db41215 100644
--- a/src/app/upgrade.cpp
+++ b/src/app/upgrade.cpp
@@ -43,6 +43,7 @@
 namespace
 {
     const int MIGRATION_VERSION = 2;
+    const char MIGRATION_VERSION_KEY[] = "Meta/MigrationVersion";
 
     void exportWebUIHttpsFiles()
     {
@@ -329,7 +330,7 @@ namespace
 
 bool upgrade(const bool /*ask*/)
 {
-    CachedSettingValue<int> version {"Meta/MigrationVersion", 0};
+    CachedSettingValue<int> version {MIGRATION_VERSION_KEY, 0};
 
     if (version != MIGRATION_VERSION)
     {
@@ -351,6 +352,11 @@ bool upgrade(const bool /*ask*/)
     return true;
 }
 
+void setCurrentMigrationVersion()
+{
+    SettingsStorage::instance()->storeValue(QLatin1String(MIGRATION_VERSION_KEY), MIGRATION_VERSION);
+}
+
 void handleChangedDefaults(const DefaultPreferencesMode mode)
 {
     struct DefaultValue
diff --git a/src/app/upgrade.h b/src/app/upgrade.h
index 62bea4c42..4271f5a19 100644
--- a/src/app/upgrade.h
+++ b/src/app/upgrade.h
@@ -36,3 +36,4 @@ enum class DefaultPreferencesMode
 
 void handleChangedDefaults(DefaultPreferencesMode mode);
 bool upgrade(bool ask = true);
+void setCurrentMigrationVersion();