aboutsummaryrefslogtreecommitdiff
path: root/scumm/sound.cpp
diff options
context:
space:
mode:
authorTravis Howell2004-07-12 14:21:16 +0000
committerTravis Howell2004-07-12 14:21:16 +0000
commitfd8f64f005883eb0d125c54e1b12d49c0eaac462 (patch)
tree4f4ffde23aaa8b0f56377bab237a78345ef84121 /scumm/sound.cpp
parentea0b3ccacc854a55290e0257468b86b2111f2d23 (diff)
downloadscummvm-rg350-fd8f64f005883eb0d125c54e1b12d49c0eaac462.tar.gz
scummvm-rg350-fd8f64f005883eb0d125c54e1b12d49c0eaac462.tar.bz2
scummvm-rg350-fd8f64f005883eb0d125c54e1b12d49c0eaac462.zip
Correction
svn-id: r14197
Diffstat (limited to 'scumm/sound.cpp')
-rw-r--r--scumm/sound.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index ece41c1377..fd36374b46 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -715,7 +715,7 @@ int Sound::isSoundRunning(int sound) const {
// ID number of the first active music it finds.
// TODO handle MRAW (pcm music) in humongous games
if (_currentMusic)
- return _currentMusic;
+ return (_musicChannelHandle.isActive()) ? _currentMusic : 0;
else
return _vm->_imuse->getSoundStatus(sound);
}