[Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.62,1.63

Max Horn fingolfin at users.sourceforge.net
Sat Dec 25 11:04:00 CET 2004


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

Modified Files:
	main.cpp 
Log Message:
Make loading the config file explicit

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- main.cpp	25 Dec 2004 18:34:43 -0000	1.62
+++ main.cpp	25 Dec 2004 19:03:13 -0000	1.63
@@ -345,7 +345,9 @@
 		}
 	}
 	if (cfgFilename != NULL)
-		ConfMan.switchFile(cfgFilename);
+		ConfMan.loadConfigFile(cfgFilename);
+	else
+		ConfMan.loadDefaultConfigFile();
 
 	// Update the config file
 	ConfMan.set("versioninfo", gScummVMVersion, Common::ConfigManager::kApplicationDomain);





More information about the Scummvm-git-logs mailing list