From 6e68e4ae31968a53c4fd4ee3ee13247979fdfa98 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Sat, 13 Feb 2016 23:35:06 +0100
Subject: [PATCH] Changed: Simplify defaultConfigPath order

--HG--
branch : develop
---
 code/ryzom/client/src/client_cfg.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index 3f28c0458..ee2aa0432 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -2215,13 +2215,11 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
 
 #ifdef NL_OS_MAC
 	// on mac, client_default.cfg should be searched in .app/Contents/Resources/
-	defaultConfigPath = CPath::standardizePath(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());
+	defaultConfigPath = getAppBundlePath() + "/Contents/Resources/";
 #else
-	// some other prefix here :)
-#endif // NL_OS_UNIX
+	// unders Windows or Linux, search client_default.cfg is same directory as executable
+	defaultConfigPath = Args.getProgramPath();
+#endif
 
 	// look in the current working directory first
 	if (CFile::isExists(defaultConfigFileName))