From 523dc6bf3a6d5a1ed62d096117ad2c2e8a213f6c Mon Sep 17 00:00:00 2001
From: rti <devnull@localhost>
Date: Tue, 9 Nov 2010 02:16:50 +0100
Subject: [PATCH] Changed: #1153 first, check for client_default.cfg in working
 dir

---
 code/ryzom/client/src/client_cfg.cpp | 30 +++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index 7f24fce54..6f9efce88 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -2168,27 +2168,33 @@ ucstring CClientConfig::buildLoadingString( const ucstring& ucstr ) const
 bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const 
 {
 	std::string defaultConfigFileName = "client_default.cfg";
+	std::string defaultConfigPath;
 	
 #ifdef NL_OS_MAC
-	// on mac, client_default.cfg is located in the .app/Contents/Resources/
-	defaultConfigFileName = 
-		CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/") + 
-		defaultConfigFileName;
+	// on mac, client_default.cfg should be searched in .app/Contents/Resources/
+	defaultConfigPath = 
+		CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
 
 #elif defined(RYZOM_ETC_PREFIX)
-	// if RYZOM_ETC_PREFIX is defined, look for client_default.cfg over there
-	defaultConfigFileName = CPath::standardizePath(RYZOM_ETC_PREFIX) + 
-		defaultConfigFileName;
+	// if RYZOM_ETC_PREFIX is defined, client_default.cfg might be over there
+	defaultConfigPath = CPath::standardizePath(RYZOM_ETC_PREFIX);
+
+#else
+	// some other prefix here :)
 
 #endif // RYZOM_ETC_PREFIX
 
-	// else, client_default.cfg has to be in the working path
-
-	if (CFile::isExists(defaultConfigFileName))
-	{
+	// look in the current working directory first
+	if(CFile::isExists(defaultConfigFileName))
 		p_name = defaultConfigFileName;
+
+	// if not in working directory, check using prefix path
+	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;
-	}
 
 	return false;
 }