[Scummvm-cvs-logs] CVS: scummvm/common stream.cpp,1.12,1.13

Johannes Schickel lordhoto at users.sourceforge.net
Mon Jan 30 06:20:05 CET 2006


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

Modified Files:
	stream.cpp 
Log Message:
Fixes a bug when loading the theme config file from a directory instead of the zip file.


Index: stream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/stream.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- stream.cpp	18 Jan 2006 17:39:34 -0000	1.12
+++ stream.cpp	30 Jan 2006 14:19:02 -0000	1.13
@@ -104,6 +104,14 @@
 
 		c = readByte();
 	}
+	
+	// This should fix a bug while using readLine with Common::File
+	// it seems that it sets the eos flag after an invalid read
+	// and at the same time the ioFailed flag
+	// the config file parser fails out of that reason for the new themes
+	if (eos()) {
+		clearIOFailed();
+	}
 
 	*p = 0;
 	return buf;





More information about the Scummvm-git-logs mailing list