[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.14.2.1,1.14.2.2

[Max Horn]

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

Modified Files:
      Tag: branch-0-6-0
	engine.cpp 
Log Message:
Workaround for bug #999122; this will fix config files which were broken by the 0.6.1 release

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.14.2.1
retrieving revision 1.14.2.2
diff -u -d -r1.14.2.1 -r1.14.2.2
--- engine.cpp	4 Mar 2004 21:13:38 -0000	1.14.2.1
+++ engine.cpp	2 Aug 2004 17:38:37 -0000	1.14.2.2
@@ -67,8 +67,17 @@
 #endif
 
 	// If SCUMMVM_SAVEPATH was not specified, try to use game specific savepath from config
-	if (!dir || dir[0] == 0)
+	if (!dir || dir[0] == 0) {
 		dir = ConfMan.get("savepath").c_str();
+		
+		// Work around a bug (#999122) in the original 0.6.1 release of
+		// ScummVM, which would insert a bad savepath value into config files.
+		if (0 == strcmp(dir, "None")) {
+			ConfMan.removeKey("savepath", ConfMan.getActiveDomain());
+			ConfMan.flushToDisk();
+			dir = ConfMan.get("savepath").c_str();
+		}
+	}
 
 	assert(dir);