[Scummvm-cvs-logs] SF.net SVN: scummvm:[40888] scummvm/trunk/engines/sci/resource.cpp

[lordhoto at users.sourceforge.net]

Revision: 40888
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40888&view=rev
Author:   lordhoto
Date:     2009-05-25 12:47:58 +0000 (Mon, 25 May 2009)

Log Message:
-----------
- Fix various valgrind warnings in the audio sync code
- Fix crash when qutting KQ 5 CD
(It was caused by resources of type "kResourceTypeSync" getting allocated an "Resource" object instead of an "ResourceSync" object, I hope this is the correct fix)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2009-05-25 12:41:14 UTC (rev 40887)
+++ scummvm/trunk/engines/sci/resource.cpp	2009-05-25 12:47:58 UTC (rev 40888)
@@ -985,7 +985,15 @@
 			resId = RESOURCE_HASH(type, number);
 			// adding new resource only if it does not exist
 			if (_resMap.contains(resId) == false) {
-				res = new Resource;
+				switch (type) {
+				case kResourceTypeSync:
+					res = new ResourceSync;
+					break;
+				default:
+					res = new Resource;
+					break;
+				}
+
 				_resMap.setVal(resId, res);
 				res->type = (ResourceType)type;
 				res->number = number;


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