Fusion avec default

--HG--
branch : compatibility

code/ryzom/client/src/client_cfg.cpp

@@ -1076,7 +1076,7 @@ void CClientConfig::setValues()
 	// NEW PATCHLET SYSTEM //
 	READ_STRING_FV(PatchletUrl)
 
-	////////////////////////
+	///////////
 	// WEBIG //
 	READ_STRING_FV(WebIgMainDomain);
 	READ_STRINGVECTOR_FV(WebIgTrustedDomains);
@@ -2211,28 +2211,24 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
 	std::string defaultConfigFileName = "client_default.cfg";
 	std::string defaultConfigPath;
 	
-	p_name = std::string();
+	p_name.clear();
 	
 #ifdef NL_OS_MAC
 	// on mac, client_default.cfg should be searched in .app/Contents/Resources/
-	defaultConfigPath = 
+	defaultConfigPath = CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
-		CPath::standardizePath(getAppBundlePath() + "/Contents/Resources/");
-
 #elif defined(RYZOM_ETC_PREFIX)
 	// 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
 
 	// look in the current working directory first
-	if(CFile::isExists(defaultConfigFileName))
+	if (CFile::isExists(defaultConfigFileName))
 		p_name = defaultConfigFileName;
 
 	// if not in working directory, check using prefix path
-	else if(CFile::isExists(defaultConfigPath + defaultConfigFileName))
+	else if (CFile::isExists(defaultConfigPath + defaultConfigFileName))
 		p_name = defaultConfigPath + defaultConfigFileName;
 
 	// if some client_default.cfg was found return true