|
|
@ -2222,9 +2222,11 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
|
|
|
|
defaultConfigPath = Args.getProgramPath();
|
|
|
|
defaultConfigPath = Args.getProgramPath();
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
std::string currentPath = CPath::standardizePath(CPath::getCurrentPath());
|
|
|
|
|
|
|
|
|
|
|
|
// look in the current working directory first
|
|
|
|
// look in the current working directory first
|
|
|
|
if (CFile::isExists(defaultConfigFileName))
|
|
|
|
if (CFile::isExists(currentPath + defaultConfigFileName))
|
|
|
|
p_name = defaultConfigFileName;
|
|
|
|
p_name = currentPath + defaultConfigFileName;
|
|
|
|
|
|
|
|
|
|
|
|
// look in startup directory
|
|
|
|
// look in startup directory
|
|
|
|
else if (CFile::isExists(Args.getStartupPath() + defaultConfigFileName))
|
|
|
|
else if (CFile::isExists(Args.getStartupPath() + defaultConfigFileName))
|
|
|
|