[Scummvm-cvs-logs] SF.net SVN: scummvm:[51240] scummvm/trunk/engines/sci/graphics/picture.cpp

[m_kiewitz at users.sourceforge.net]

Revision: 51240
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51240&view=rev
Author:   m_kiewitz
Date:     2010-07-24 08:20:54 +0000 (Sat, 24 Jul 2010)

Log Message:
-----------
SCI: locking picture resource

fixes sq6 crashing with resource data NULL pointer

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/picture.cpp

Modified: scummvm/trunk/engines/sci/graphics/picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/picture.cpp	2010-07-24 08:08:19 UTC (rev 51239)
+++ scummvm/trunk/engines/sci/graphics/picture.cpp	2010-07-24 08:20:54 UTC (rev 51240)
@@ -43,10 +43,11 @@
 }
 
 GfxPicture::~GfxPicture() {
+	_resMan->unlockResource(_resource);
 }
 
 void GfxPicture::initData(GuiResourceId resourceId) {
-	_resource = _resMan->findResource(ResourceId(kResourceTypePic, resourceId), false);
+	_resource = _resMan->findResource(ResourceId(kResourceTypePic, resourceId), true);
 	if (!_resource) {
 		error("picture resource %d not found", resourceId);
 	}


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