Changed: Simplify defaultConfigPath order

--HG--
branch : develop
hg/feature/material-editor
kervala 9 years ago
parent 40d8fdede0
commit 6e68e4ae31

@ -2215,13 +2215,11 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
#ifdef NL_OS_MAC #ifdef NL_OS_MAC
// on mac, client_default.cfg should be searched in .app/Contents/Resources/ // on mac, client_default.cfg should be searched in .app/Contents/Resources/
defaultConfigPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/"); defaultConfigPath = getAppBundlePath() + "/Contents/Resources/";
#elif defined(NL_OS_UNIX)
// if RYZOM_ETC_PREFIX is defined, client_default.cfg might be over there
defaultConfigPath = CPath::standardizePath(getRyzomEtcPrefix());
#else #else
// some other prefix here :) // unders Windows or Linux, search client_default.cfg is same directory as executable
#endif // NL_OS_UNIX defaultConfigPath = Args.getProgramPath();
#endif
// look in the current working directory first // look in the current working directory first
if (CFile::isExists(defaultConfigFileName)) if (CFile::isExists(defaultConfigFileName))

Loading…
Cancel
Save