d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-14 16:57:55 +00:00
Code Issues Projects Releases Wiki Activity

Set appropriate migration version number for new installations

Browse Source
This commit is contained in:
Chocobo1 2021-12-23 14:36:19 +08:00
parent 39f054eef6
commit e7ebbffbfd
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/main.cpp
View File

@ -188,7 +188,6 @@ int main(int argc, char *argv[])
#ifndef DISABLE_GUI #ifndef DISABLE_GUI
if (!userAgreesWithLegalNotice()) if (!userAgreesWithLegalNotice())
return EXIT_SUCCESS; return EXIT_SUCCESS;
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
if (_isatty(_fileno(stdin)) if (_isatty(_fileno(stdin))
&& _isatty(_fileno(stdout)) && _isatty(_fileno(stdout))
@ -201,6 +200,8 @@ int main(int argc, char *argv[])
&& !userAgreesWithLegalNotice()) && !userAgreesWithLegalNotice())
return EXIT_SUCCESS; return EXIT_SUCCESS;
#endif #endif
setCurrentMigrationVersion();
} }
// Check if qBittorrent is already running for this user // Check if qBittorrent is already running for this user

8
src/app/upgrade.cpp
View File

@ -43,6 +43,7 @@
namespace namespace
{ {
const int MIGRATION_VERSION = 2; const int MIGRATION_VERSION = 2;
const char MIGRATION_VERSION_KEY[] = "Meta/MigrationVersion";
void exportWebUIHttpsFiles() void exportWebUIHttpsFiles()
{ {
@ -329,7 +330,7 @@ namespace
bool upgrade(const bool /*ask*/) bool upgrade(const bool /*ask*/)
{ {
CachedSettingValue<int> version {"Meta/MigrationVersion", 0}; CachedSettingValue<int> version {MIGRATION_VERSION_KEY, 0};
if (version != MIGRATION_VERSION) if (version != MIGRATION_VERSION)
{ {
@ -351,6 +352,11 @@ bool upgrade(const bool /*ask*/)
return true; return true;
} }
void setCurrentMigrationVersion()
{
SettingsStorage::instance()->storeValue(QLatin1String(MIGRATION_VERSION_KEY), MIGRATION_VERSION);
}
void handleChangedDefaults(const DefaultPreferencesMode mode) void handleChangedDefaults(const DefaultPreferencesMode mode)
{ {
struct DefaultValue struct DefaultValue

1
src/app/upgrade.h
View File

@ -36,3 +36,4 @@ enum class DefaultPreferencesMode
void handleChangedDefaults(DefaultPreferencesMode mode); void handleChangedDefaults(DefaultPreferencesMode mode);
bool upgrade(bool ask = true); bool upgrade(bool ask = true);
void setCurrentMigrationVersion();