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

[fingolfin at users.sourceforge.net]

Revision: 33729
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33729&view=rev
Author:   fingolfin
Date:     2008-08-09 22:42:03 +0000 (Sat, 09 Aug 2008)

Log Message:
-----------
If no default config file is present, just don't load it, instead of crashing

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

Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp	2008-08-09 22:40:05 UTC (rev 33728)
+++ scummvm/trunk/common/config-manager.cpp	2008-08-09 22:42:03 UTC (rev 33729)
@@ -64,9 +64,9 @@
 	SeekableReadStream *stream = g_system->openConfigFileForReading();
 	_filename.clear();	// clear the filename to indicate that we are using the default config file
 
-	// ... load it ...
-	assert(stream);
-	loadFromStream(*stream);
+	// ... load it, if available ...
+	if (stream)
+		loadFromStream(*stream);
 	
 	// ... and close it again.
 	delete stream;


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