Changed: #1153 check in working path even if RYZOM_ETC_PREFIX is defined

code/ryzom/client/src/client_cfg.cpp




@@ -2176,14 +2176,17 @@
 		defaultConfigFileName;

 #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 it does not exist in the working path, try RYZOM_ETC_PREFIX
+	if (!CFile::isExists(defaultConfigFileName))
+		defaultConfigFileName = CPath::standardizePath(RYZOM_ETC_PREFIX) +
+			defaultConfigFileName;
+
+#else
+	// do not prepend anything, just check in the working path

 #endif // RYZOM_ETC_PREFIX

-	// else, client_default.cfg has to be in the working path
-
+	// check for existance and return true if found
 	if (CFile::isExists(defaultConfigFileName))
 	{
 		p_name = defaultConfigFileName;