[Scummvm-cvs-logs] SF.net SVN: scummvm:[47789] scummvm/trunk/engines/sci/resource.cpp
waltervn at users.sourceforge.net
waltervn at users.sourceforge.net
Mon Feb 1 02:05:15 CET 2010
Revision: 47789
http://scummvm.svn.sourceforge.net/scummvm/?rev=47789&view=rev
Author: waltervn
Date: 2010-02-01 01:05:08 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
SCI: When removing audio resources from the resource manager, also remove them from the LRU list.
Modified Paths:
--------------
scummvm/trunk/engines/sci/resource.cpp
Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp 2010-02-01 00:53:13 UTC (rev 47788)
+++ scummvm/trunk/engines/sci/resource.cpp 2010-02-01 01:05:08 UTC (rev 47789)
@@ -1279,11 +1279,14 @@
Resource *res = _resMap.getVal(resId);
if (res->source->source_type == kSourceAudioVolume) {
- if (res->lockers == 0) {
+ if (res->status == kResStatusLocked) {
+ warning("Failed to remove resource %s (still in use)", resId.toString().c_str());
+ } else {
+ if (res->status == kResStatusEnqueued)
+ removeFromLRU(res);
+
_resMap.erase(resId);
delete res;
- } else {
- warning("Failed to remove resource %s (still in use)", resId.toString().c_str());
}
}
}
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