thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: When removing audio resources from the resource manager, also remove them from the LRU list.

Browse source 
svn-id: r47789
This commit is contained in:
Walter van Niftrik 2010-02-01 01:05:08 +00:00
parent 313b531d56
commit f24e0aad2b
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/sci/resource.cpp
View file

@ -1279,11 +1279,14 @@ void ResourceManager::removeAudioResource(ResourceId resId) {
Resource *res = _resMap.getVal(resId); Resource *res = _resMap.getVal(resId);
if (res->source->source_type == kSourceAudioVolume) { 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); _resMap.erase(resId);
delete res; delete res;
} else {
warning("Failed to remove resource %s (still in use)", resId.toString().c_str());
} }
} }
} }