aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2011-11-02 00:23:18 +0200
committerFilippos Karapetis2011-11-02 00:23:18 +0200
commit9dcab12160525bd1fa2ea9054ab5430bf151c386 (patch)
tree95858c3274f104c3db6bb4be488670e806afe9e2
parent1a17bba1e4bf8fcc71517c56420e61760788eeef (diff)
downloadscummvm-rg350-9dcab12160525bd1fa2ea9054ab5430bf151c386.tar.gz
scummvm-rg350-9dcab12160525bd1fa2ea9054ab5430bf151c386.tar.bz2
scummvm-rg350-9dcab12160525bd1fa2ea9054ab5430bf151c386.zip
SCI: Fixed bug in commit 1a17bba.
Thanks to wjp for pointing it out.
-rw-r--r--engines/sci/resource_audio.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 7cf2b76eba..a3cf1b0c84 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -922,8 +922,10 @@ void ResourceManager::changeAudioDirectory(Common::String path) {
// Remove the resource source, if it's an audio map or an audio file
if (sourceType == kSourceIntMap || sourceType == kSourceAudioVolume) {
// Don't remove 65535.map (the SFX map) or resource.sfx
- if (source->_volumeNumber == 65535 || source->getLocationName() == "RESOURCE.SFX")
+ if (source->_volumeNumber == 65535 || source->getLocationName() == "RESOURCE.SFX") {
+ ++it;
continue;
+ }
// erase() will move the iterator to the next element
it = _sources.erase(it);