[Scummvm-cvs-logs] CVS: scummvm/base gameDetector.cpp,1.83,1.84

Chris Apers chrilith at users.sourceforge.net
Fri Oct 8 09:11:40 CEST 2004


Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3175

Modified Files:
	gameDetector.cpp 
Log Message:
Prevent double slash in path

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- gameDetector.cpp	12 Sep 2004 14:20:56 -0000	1.83
+++ gameDetector.cpp	8 Oct 2004 16:07:42 -0000	1.84
@@ -566,7 +566,7 @@
 	String gameDataPath(ConfMan.get("path"));
 	if (gameDataPath.isEmpty()) {
 		warning("No path was provided. Assuming the data files are in the current directory");
-#ifndef __PALM_OS__	// add last slash also in File::fopenNoCase, so this is not needed
+		gameDataPath = "./";
 	} else if (gameDataPath.lastChar() != '/'
 #ifdef __MORPHOS__
 					&& gameDataPath.lastChar() != ':'
@@ -574,7 +574,6 @@
 					&& gameDataPath.lastChar() != '\\') {
 		gameDataPath += '/';
 		ConfMan.set("path", gameDataPath, kTransientDomain);
-#endif
 	}
 
 	return true;





More information about the Scummvm-git-logs mailing list