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

All platform: at startup, ensure that a proper directory for sounds is set

Browse source
This commit is contained in:
Fabio Bas 2015-05-14 15:47:57 +02:00
parent 924337ee93
commit 8fba04397b
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cockatrice/src/main.cpp
View file

@ -165,6 +165,20 @@ int main(int argc, char *argv[])
if (!QDir().mkpath(settingsCache->getPicsPath() + "/CUSTOM")) if (!QDir().mkpath(settingsCache->getPicsPath() + "/CUSTOM"))
qDebug() << "Could not create " + settingsCache->getPicsPath().toUtf8() + "/CUSTOM. Will fall back on default card images."; qDebug() << "Could not create " + settingsCache->getPicsPath().toUtf8() + "/CUSTOM. Will fall back on default card images.";
if(settingsCache->getSoundPath().isEmpty() || !QDir(settingsCache->getSoundPath()).exists())
{
QDir tmpDir;
#ifdef Q_OS_MAC
tmpDir = app.applicationDirPath() + "/../Resources/sounds";
#elif defined(Q_OS_WIN)
tmpDir = app.applicationDirPath() + "/sounds";
#else // linux
tmpDir = app.applicationDirPath() + "/../share/cockatrice/sounds/";
#endif
settingsCache->setSoundPath(tmpDir.canonicalPath());
}
if (!settingsValid() || db->getLoadStatus() != Ok) { if (!settingsValid() || db->getLoadStatus() != Ok) {
qDebug("main(): invalid settings or load status"); qDebug("main(): invalid settings or load status");
DlgSettings dlgSettings; DlgSettings dlgSettings;