mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-25 18:30:53 +00:00
Changed: Minor changes
This commit is contained in:
parent
e84dd7b5f7
commit
01bc4eeb92
1 changed files with 8 additions and 12 deletions
|
@ -1076,7 +1076,7 @@ void CClientConfig::setValues()
|
||||||
// NEW PATCHLET SYSTEM //
|
// NEW PATCHLET SYSTEM //
|
||||||
READ_STRING_FV(PatchletUrl)
|
READ_STRING_FV(PatchletUrl)
|
||||||
|
|
||||||
////////////////////////
|
///////////
|
||||||
// WEBIG //
|
// WEBIG //
|
||||||
READ_STRING_FV(WebIgMainDomain);
|
READ_STRING_FV(WebIgMainDomain);
|
||||||
READ_STRINGVECTOR_FV(WebIgTrustedDomains);
|
READ_STRINGVECTOR_FV(WebIgTrustedDomains);
|
||||||
|
@ -2211,28 +2211,24 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
|
||||||
std::string defaultConfigFileName = "client_default.cfg";
|
std::string defaultConfigFileName = "client_default.cfg";
|
||||||
std::string defaultConfigPath;
|
std::string defaultConfigPath;
|
||||||
|
|
||||||
p_name = std::string();
|
p_name.clear();
|
||||||
|
|
||||||
#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 =
|
defaultConfigPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
|
||||||
CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
|
|
||||||
|
|
||||||
#elif defined(RYZOM_ETC_PREFIX)
|
#elif defined(RYZOM_ETC_PREFIX)
|
||||||
// if RYZOM_ETC_PREFIX is defined, client_default.cfg might be over there
|
// if RYZOM_ETC_PREFIX is defined, client_default.cfg might be over there
|
||||||
defaultConfigPath = CPath::standardizePath(RYZOM_ETC_PREFIX);
|
defaultConfigPath = CPath::standardizePath(RYZOM_ETC_PREFIX);
|
||||||
|
|
||||||
#else
|
#else
|
||||||
// some other prefix here :)
|
// some other prefix here :)
|
||||||
|
|
||||||
#endif // RYZOM_ETC_PREFIX
|
#endif // RYZOM_ETC_PREFIX
|
||||||
|
|
||||||
// look in the current working directory first
|
// look in the current working directory first
|
||||||
if(CFile::isExists(defaultConfigFileName))
|
if (CFile::isExists(defaultConfigFileName))
|
||||||
p_name = defaultConfigFileName;
|
p_name = defaultConfigFileName;
|
||||||
|
|
||||||
// if not in working directory, check using prefix path
|
// if not in working directory, check using prefix path
|
||||||
else if(CFile::isExists(defaultConfigPath + defaultConfigFileName))
|
else if (CFile::isExists(defaultConfigPath + defaultConfigFileName))
|
||||||
p_name = defaultConfigPath + defaultConfigFileName;
|
p_name = defaultConfigPath + defaultConfigFileName;
|
||||||
|
|
||||||
// if some client_default.cfg was found return true
|
// if some client_default.cfg was found return true
|
||||||
|
|
Loading…
Reference in a new issue