aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2014-10-02 18:22:41 +0200
committerWillem Jan Palenstijn2015-02-14 16:06:55 +0100
commit84d2414a7dceca9d5140936667aae05fbbfdcf99 (patch)
treea794b36ca04b9e3124395b704acc2045dc7a3a58
parent53a2c30cb014997887e29f5fd0db1348d05990f0 (diff)
downloadscummvm-rg350-84d2414a7dceca9d5140936667aae05fbbfdcf99.tar.gz
scummvm-rg350-84d2414a7dceca9d5140936667aae05fbbfdcf99.tar.bz2
scummvm-rg350-84d2414a7dceca9d5140936667aae05fbbfdcf99.zip
SCI: Avoid resetting already unused channels
-rw-r--r--engines/sci/sound/music.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 7a6eaf62b4..5a37357045 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -1063,7 +1063,7 @@ void SciMusic::remapChannels() {
// And finally, stop any empty channels
for (int i = _driverFirstChannel; i <= _driverLastChannel; ++i) {
- if (!_channelMap[i]._song)
+ if (!_channelMap[i]._song && currentMap[i]._song)
resetDeviceChannel(i);
}