[Scummvm-cvs-logs] SF.net SVN: scummvm:[48653] scummvm/trunk/common/config-manager.cpp

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue Apr 13 12:08:17 CEST 2010


Revision: 48653
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48653&view=rev
Author:   fingolfin
Date:     2010-04-13 10:08:17 +0000 (Tue, 13 Apr 2010)

Log Message:
-----------
Print message when creating new INI; don't rewrite it directly after reading.

Together with the r48651, this addresses bug #2983718:
 "Incomprehensible message for missing scummvm.ini"

Modified Paths:
--------------
    scummvm/trunk/common/config-manager.cpp

Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp	2010-04-13 09:54:21 UTC (rev 48652)
+++ scummvm/trunk/common/config-manager.cpp	2010-04-13 10:08:17 UTC (rev 48653)
@@ -61,13 +61,18 @@
 	_filename.clear();	// clear the filename to indicate that we are using the default config file
 
 	// ... load it, if available ...
-	if (stream)
+	if (stream) {
 		loadFromStream(*stream);
 
-	// ... and close it again.
-	delete stream;
+		// ... and close it again.
+		delete stream;
 
-	flushToDisk();
+	} else {
+		// No config file -> create new one!
+		printf("Default configuration file missing, creating a new one\n");
+
+		flushToDisk();
+	}
 }
 
 void ConfigManager::loadConfigFile(const String &filename) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list