[Scummvm-cvs-logs] SF.net SVN: scummvm:[43341] scummvm/branches/branch-1-0-0/engines/kyra/ staticres.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Thu Aug 13 02:22:40 CEST 2009


Revision: 43341
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43341&view=rev
Author:   lordhoto
Date:     2009-08-13 00:22:39 +0000 (Thu, 13 Aug 2009)

Log Message:
-----------
Backport of r43340: "Fix serious bug in StaticResource::unloadId."

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/kyra/staticres.cpp

Modified: scummvm/branches/branch-1-0-0/engines/kyra/staticres.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/staticres.cpp	2009-08-13 00:21:42 UTC (rev 43340)
+++ scummvm/branches/branch-1-0-0/engines/kyra/staticres.cpp	2009-08-13 00:22:39 UTC (rev 43341)
@@ -606,6 +606,7 @@
 		if (pos->id == id || id == -1) {
 			const FileType *filetype = getFiletype(pos->type);
 			(this->*(filetype->free))(pos->data, pos->size);
+			pos = _resList.erase(pos);
 			if (id != -1)
 				break;
 		}


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