aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-10 09:19:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-03-15 17:45:55 +01:00
commit 182a9201c3
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/ryzom/client/src/client_cfg.cpp
View file

@ -2213,6 +2213,7 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
#endif
std::string currentPath = CPath::standardizePath(CPath::getCurrentPath());
std::string etcPath = CPath::standardizePath(getRyzomEtcPrefix());
// look in the current working directory first
if (CFile::isExists(currentPath + defaultConfigFileName))
@ -2222,13 +2223,14 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
else if (CFile::isExists(Args.getStartupPath() + defaultConfigFileName))
p_name = Args.getStartupPath() + defaultConfigFileName;
// look in prefix path
// look in application directory
else if (CFile::isExists(defaultConfigPath + defaultConfigFileName))
p_name = defaultConfigPath + defaultConfigFileName;
// if some client_default.cfg was found return true
if (p_name.size())
return true;
// look in etc prefix path
else if (!etcPath.empty() && CFile::isExists(etcPath + defaultConfigFileName))
p_name = etcPath + defaultConfigFileName;
return false;
// if some client_default.cfg was found return true
return !p_name.empty();
}