From e740775735f73f2e1be7ebda597110b7f0233990 Mon Sep 17 00:00:00 2001
From: Mark Vejvoda <mark_vejvoda@hotmail.com>
Date: Tue, 4 Oct 2011 21:14:33 +0000
Subject: [PATCH] - bugfix for ini on windows (and added console output in
 verbose mode

---
 source/glest_game/global/config.cpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/source/glest_game/global/config.cpp b/source/glest_game/global/config.cpp
index bf808319..6f6bbdf8 100644
--- a/source/glest_game/global/config.cpp
+++ b/source/glest_game/global/config.cpp
@@ -97,14 +97,20 @@ bool Config::tryCustomPath(std::pair<ConfigType,ConfigType> &type, std::pair<str
     	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("-=-=-=-=-=-=-= looking for file in possible location  [%s]\n",linuxPath.c_str());
 
 #if defined(__linux__)
-    	if(wasFound == false && fileExists(linuxPath + "linux_" + file.first) == true) {
-        	file.first = linuxPath + "linux_" + file.first;
+		string nixFile = linuxPath + "linux_" + file.first;
+		if(SystemFlags::VERBOSE_MODE_ENABLED) printf("-=-=-=-=-=-=-= looking for linux specific file in possible location  [%s]\n",nixFile.c_str());
+
+    	if(wasFound == false && fileExists(nixFile) == true) {
+        	file.first = nixFile;
         	file.second = linuxPath + file.second;
         	wasFound = true;
     	}
-#elif defined(__WINDOWS__)
-    	if(wasFound == false && fileExists(linuxPath + "windows_" + file.first) == true) {
-        	file.first = linuxPath + "windows_" + file.first;
+#elif defined(__WIN32__)
+		string winFile = linuxPath + "windows_" + file.first;
+		if(SystemFlags::VERBOSE_MODE_ENABLED) printf("-=-=-=-=-=-=-= looking for windows specific file in possible location  [%s]\n",winFile.c_str());
+
+		if(wasFound == false && fileExists(winFile) == true) {
+        	file.first = winFile;
         	file.second = linuxPath + file.second;
         	wasFound = true;
     	}