aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #3783 (#3785)

Browse source
This commit is contained in:
ctrlaltca 2019-07-17 16:05:00 +02:00 committed by Zach H
parent faf02100a5
commit 013137c418
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cockatrice/src/window_main.cpp
View file

@ -851,6 +851,7 @@ void MainWindow::startupConfigCheck()
// no config found, 99% new clean install // no config found, 99% new clean install
qDebug() << "Startup: old client version empty, assuming first start after clean install"; qDebug() << "Startup: old client version empty, assuming first start after clean install";
alertForcedOracleRun(VERSION_STRING, false); alertForcedOracleRun(VERSION_STRING, false);
settingsCache->setClientVersion(VERSION_STRING);
} else if (settingsCache->getClientVersion() != VERSION_STRING) { } else if (settingsCache->getClientVersion() != VERSION_STRING) {
// config found, from another (presumably older) version // config found, from another (presumably older) version
qDebug() << "Startup: old client version" << settingsCache->getClientVersion() qDebug() << "Startup: old client version" << settingsCache->getClientVersion()
@ -860,6 +861,7 @@ void MainWindow::startupConfigCheck()
} else { } else {
QtConcurrent::run(db, &CardDatabase::loadCardDatabases); QtConcurrent::run(db, &CardDatabase::loadCardDatabases);
} }
settingsCache->setClientVersion(VERSION_STRING);
} else { } else {
// previous config from this version found // previous config from this version found
qDebug() << "Startup: found config with current version"; qDebug() << "Startup: found config with current version";
@ -876,7 +878,6 @@ void MainWindow::startupConfigCheck()
void MainWindow::alertForcedOracleRun(const QString &version, bool isUpdate) void MainWindow::alertForcedOracleRun(const QString &version, bool isUpdate)
{ {
settingsCache->setClientVersion(version);
if (isUpdate) { if (isUpdate) {
QMessageBox::information(this, tr("New Version"), QMessageBox::information(this, tr("New Version"),
tr("Congratulations on updating to Cockatrice %1!\n" tr("Congratulations on updating to Cockatrice %1!\n"