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

Custom image file path corrected (#3119)

Browse source
This commit is contained in:
David Szabo 2018-02-26 05:22:41 +01:00 committed by Zach H
parent 7cfbf114b7
commit 941a06e107
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/settingscache.cpp
View file

@ -11,7 +11,7 @@
QString SettingsCache::getDataPath() QString SettingsCache::getDataPath()
{ {
if (isPortableBuild) if (isPortableBuild)
return qApp->applicationDirPath() + "/data/"; return qApp->applicationDirPath() + "/data";
else else
return QStandardPaths::writableLocation(QStandardPaths::DataLocation); return QStandardPaths::writableLocation(QStandardPaths::DataLocation);
} }
@ -183,7 +183,11 @@ SettingsCache::SettingsCache()
replaysPath = getSafeConfigPath("paths/replays", dataPath + "/replays/"); replaysPath = getSafeConfigPath("paths/replays", dataPath + "/replays/");
picsPath = getSafeConfigPath("paths/pics", dataPath + "/pics/"); picsPath = getSafeConfigPath("paths/pics", dataPath + "/pics/");
// this has never been exposed as an user-configurable setting // this has never been exposed as an user-configurable setting
if (picsPath.endsWith("/")) {
customPicsPath = getSafeConfigPath("paths/custompics", picsPath + "CUSTOM/");
} else {
customPicsPath = getSafeConfigPath("paths/custompics", picsPath + "/CUSTOM/"); customPicsPath = getSafeConfigPath("paths/custompics", picsPath + "/CUSTOM/");
}
// this has never been exposed as an user-configurable setting // this has never been exposed as an user-configurable setting
customCardDatabasePath = getSafeConfigPath("paths/customsets", dataPath + "/customsets/"); customCardDatabasePath = getSafeConfigPath("paths/customsets", dataPath + "/customsets/");