aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2014-07-25 22:53:49 +0200
committeruruk2014-07-25 22:53:49 +0200
commit62e0a32a903321fd40234a245fd5b301ed50431c (patch)
tree3a29e79fa5b8bff7626127dd734e5b4f3c3fc0d1
parentac178b6013f3a1b090cfca1d8e9e2ad6429f4e77 (diff)
downloadscummvm-rg350-62e0a32a903321fd40234a245fd5b301ed50431c.tar.gz
scummvm-rg350-62e0a32a903321fd40234a245fd5b301ed50431c.tar.bz2
scummvm-rg350-62e0a32a903321fd40234a245fd5b301ed50431c.zip
CGE2: Repair checkVolumeSwitches().
-rw-r--r--engines/cge2/toolbar.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/cge2/toolbar.cpp b/engines/cge2/toolbar.cpp
index 2242cc41ff..ce951f5baa 100644
--- a/engines/cge2/toolbar.cpp
+++ b/engines/cge2/toolbar.cpp
@@ -188,7 +188,8 @@ void CGE2Engine::checkVolumeSwitches() {
if (!sfxMuted)
sfxMuted = sfxVolume == 0;
- if ((!musicMuted && !_music) || (musicVolume != _oldMusicVolume)) {
+ if ((!musicMuted && !_music) ||
+ (musicVolume != _oldMusicVolume && !musicMuted)) {
_vol[1]->step(musicVolume / kSoundNumtoStateRate);
}
if (musicMuted && _music) {