Replace unix-style paths with platform-specific paths when adding

mapmod paths to search paths. This should fix ticket:3759. Patch by crabster, modified by me.
Warzone2100 · Dec 8, 2012 · 1fd7036 · 1fd7036
1 parent 3f1d0ab
commit 1fd7036
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -368,8 +368,9 @@ bool rebuildSearchPath( searchPathMode mode, bool force )
 				// Add the selected map first, for mapmod support
 				if (current_map != NULL)
 				{
-					std::string realPathAndDir = std::string(PHYSFS_getRealDir(current_map)) + current_map;
-					PHYSFS_addToSearchPath(realPathAndDir.c_str(), PHYSFS_APPEND);
+					QString realPathAndDir = QString::fromUtf8(PHYSFS_getRealDir(current_map)) + current_map;
+					realPathAndDir.replace('/', PHYSFS_getDirSeparator()); // Windows fix
+					PHYSFS_addToSearchPath(realPathAndDir.toUtf8().constData(), PHYSFS_APPEND);
 				}
 				curSearchPath = searchPathRegistry;
 				while (curSearchPath->lowerPriority)