From 077d9f2745f212889d83533ecbb70bccc0687305 Mon Sep 17 00:00:00 2001 From: Peng Liu Date: Thu, 31 Jul 2014 17:30:15 -0400 Subject: [PATCH 1/3] Checks if CUSTOM folder was successfully created. If not, prints qDebug message and proceeds as normal except uses default card images instead of custom ones. --- cockatrice/src/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index df38bbf6..d53462d0 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -158,7 +158,9 @@ int main(int argc, char *argv[]) QDir().mkpath(dataDir + "/pics"); settingsCache->setPicsPath(dataDir + "/pics"); } - + if (!QDir().mkpath(settingsCache->getPicsPath() + "/CUSTOM")) + qDebug("Could not create " settingsCache->getPicsPath() + "/CUSTOM. Will fall back on default card images."); + #ifdef Q_OS_MAC if(settingsCache->getHandBgPath().isEmpty() && settingsCache->getStackBgPath().isEmpty() && From b3fa99ef36a53e3be101d9127f849fa648350a2b Mon Sep 17 00:00:00 2001 From: Peng Liu Date: Thu, 31 Jul 2014 23:04:30 -0400 Subject: [PATCH 2/3] I was too hasty and forgot a + and to toLatin1() a QString in the qDebug arg. --- cockatrice/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index d53462d0..1cda35de 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) settingsCache->setPicsPath(dataDir + "/pics"); } if (!QDir().mkpath(settingsCache->getPicsPath() + "/CUSTOM")) - qDebug("Could not create " settingsCache->getPicsPath() + "/CUSTOM. Will fall back on default card images."); + qDebug("Could not create " + settingsCache->getPicsPath().toLatin1() + "/CUSTOM. Will fall back on default card images."); #ifdef Q_OS_MAC if(settingsCache->getHandBgPath().isEmpty() && From a9eaf65a826cf22c9156cc5cb21e49c42fc56d0b Mon Sep 17 00:00:00 2001 From: Peng Liu Date: Sat, 2 Aug 2014 23:44:31 -0400 Subject: [PATCH 3/3] Changed .toLatin1() to .toUtf8(). --- cockatrice/src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index 1cda35de..a6608ac9 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) settingsCache->setPicsPath(dataDir + "/pics"); } if (!QDir().mkpath(settingsCache->getPicsPath() + "/CUSTOM")) - qDebug("Could not create " + settingsCache->getPicsPath().toLatin1() + "/CUSTOM. Will fall back on default card images."); + qDebug("Could not create " + settingsCache->getPicsPath().toUtf8() + "/CUSTOM. Will fall back on default card images."); #ifdef Q_OS_MAC if(settingsCache->getHandBgPath().isEmpty() &&