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

Startup: fix resetting card database to default

Browse source 
The check was inverted. LoadStatus::Ok = 0, so only when
db->loadCardDatabase() returns 0 we know the card database path is
correct
This commit is contained in:
Fabio Bas 2015-03-30 12:28:13 +02:00
parent 0e3711723d
commit b5b7ad8958
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/carddatabase.cpp
View file

@ -926,7 +926,7 @@ LoadStatus CardDatabase::loadCardDatabase(const QString &path, bool tokens)
if (!tokens) { if (!tokens) {
loadStatus = tempLoadStatus; loadStatus = tempLoadStatus;
qDebug() << "loadCardDatabase(): Status = " << loadStatus; qDebug() << "loadCardDatabase(): Path = " << path << " Status = " << loadStatus;
} }

2
cockatrice/src/main.cpp
View file

@ -146,7 +146,7 @@ int main(int argc, char *argv[])
const QString dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first(); const QString dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first();
#endif #endif
if (!db->getLoadSuccess()) if (!db->getLoadSuccess())
if (db->loadCardDatabase(dataDir + "/cards.xml")) if (!db->loadCardDatabase(dataDir + "/cards.xml"))
settingsCache->setCardDatabasePath(dataDir + "/cards.xml"); settingsCache->setCardDatabasePath(dataDir + "/cards.xml");
if (settingsCache->getTokenDatabasePath().isEmpty()) if (settingsCache->getTokenDatabasePath().isEmpty())
settingsCache->setTokenDatabasePath(dataDir + "/tokens.xml"); settingsCache->setTokenDatabasePath(dataDir + "/tokens.xml");