From 527c1cd200dbdcebac3cd141c8733cdb4e694948 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 2 Aug 2004 17:09:31 +0000
Subject: Workaround for bug #999122; this will fix config files which were
 broken by the 0.6.1 release

svn-id: r14444
---
 base/engine.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'base')

diff --git a/base/engine.cpp b/base/engine.cpp
index da98ea7bb7..abec0afe2c 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -69,8 +69,17 @@ const char *Engine::getSavePath() const {
 #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();
+		}
+	}
 
 #ifdef _WIN32_WCE
 	if (dir[0] == 0)
-- 
cgit v1.2.3