From b5b7ad8958674db05315a62831a9c70e59e763e1 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 30 Mar 2015 12:28:13 +0200 Subject: [PATCH] Startup: fix resetting card database to default The check was inverted. LoadStatus::Ok = 0, so only when db->loadCardDatabase() returns 0 we know the card database path is correct --- cockatrice/src/carddatabase.cpp | 2 +- cockatrice/src/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp index 64573617..8c0617d6 100644 --- a/cockatrice/src/carddatabase.cpp +++ b/cockatrice/src/carddatabase.cpp @@ -926,7 +926,7 @@ LoadStatus CardDatabase::loadCardDatabase(const QString &path, bool tokens) if (!tokens) { loadStatus = tempLoadStatus; - qDebug() << "loadCardDatabase(): Status = " << loadStatus; + qDebug() << "loadCardDatabase(): Path = " << path << " Status = " << loadStatus; } diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index b21cc374..672fb17a 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -146,7 +146,7 @@ int main(int argc, char *argv[]) const QString dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first(); #endif if (!db->getLoadSuccess()) - if (db->loadCardDatabase(dataDir + "/cards.xml")) + if (!db->loadCardDatabase(dataDir + "/cards.xml")) settingsCache->setCardDatabasePath(dataDir + "/cards.xml"); if (settingsCache->getTokenDatabasePath().isEmpty()) settingsCache->setTokenDatabasePath(dataDir + "/tokens.xml");