From 9dc77d674ffe420eba92066c1de2eaac4f54012e Mon Sep 17 00:00:00 2001 From: woogerboy21 Date: Sat, 5 Sep 2015 17:44:51 -0400 Subject: [PATCH] Fix older gcc nested pre-def with portable builds --- cockatrice/src/main.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index c6f303b6..c0a99c8c 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -158,13 +158,12 @@ int main(int argc, char *argv[]) #ifdef PORTABLE_BUILD const QString dataDir = "data/"; -#else -#if QT_VERSION < 0x050000 +#elif QT_VERSION < 0x050000 const QString dataDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation); #else const QString dataDir = QStandardPaths::standardLocations(QStandardPaths::DataLocation).first(); #endif -#endif + if (!db->getLoadSuccess()) if (!db->loadCardDatabase(dataDir + "/cards.xml")) settingsCache->setCardDatabasePath(dataDir + "/cards.xml");