Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: getInstallerCurrentDirPath() returns bundle parent directory under OS X

Browse source
This commit is contained in:
kervala 2016-10-17 11:19:11 +02:00
parent 681d3b5c73
commit a307601382
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
code/ryzom/tools/client/ryzom_installer/src/configfile.cpp
View file

@ -752,7 +752,19 @@ QString CConfigFile::getInstallerCurrentFilePath() const
QString CConfigFile::getInstallerCurrentDirPath() const
{
// installer is always run from TEMP under Windows
return QApplication::applicationDirPath();
QString appDir = QApplication::applicationDirPath();
#ifdef Q_OS_MAC
QDir dir(appDir);
dir.cdUp(); // .. = Contents
dir.cdUp(); // .. = .app
dir.cdUp(); // .. = <parent>
// return absolute path
appDir = dir.absolutePath();
#endif
return appDir;
}
QString CConfigFile::getInstallerInstalledFilePath() const