From 89d1c5140828923abfdeb83610078aa336d5000e Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 23 Feb 2016 16:58:07 +0100 Subject: [PATCH] Fixed: Use full path for client_default.cfg --HG-- branch : develop --- code/ryzom/client/src/client_cfg.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp index 32b345294..e59dd6886 100644 --- a/code/ryzom/client/src/client_cfg.cpp +++ b/code/ryzom/client/src/client_cfg.cpp @@ -2222,9 +2222,11 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const defaultConfigPath = Args.getProgramPath(); #endif + std::string currentPath = CPath::standardizePath(CPath::getCurrentPath()); + // look in the current working directory first - if (CFile::isExists(defaultConfigFileName)) - p_name = defaultConfigFileName; + if (CFile::isExists(currentPath + defaultConfigFileName)) + p_name = currentPath + defaultConfigFileName; // look in startup directory else if (CFile::isExists(Args.getStartupPath() + defaultConfigFileName))