aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/sound/music.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index e1446063af..c28676019b 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -499,12 +499,16 @@ void MusicEntry::doFade() {
}
// Only process MIDI streams in this thread, not digital sound effects
- if (pMidiParser)
-#ifndef DISABLE_VOLUME_FADING
- pMidiParser->setVolume(volume);
-#else
- pMidiParser->setVolume(fadeTo);
+ if (pMidiParser) {
+#ifdef DISABLE_VOLUME_FADING
+ // Signal fading to stop...
+ volume = fadeTo;
+ fadeStep = 0;
+ fadeCompleted = true;
#endif
+ pMidiParser->setVolume(volume);
+ }
+
fadeSetVolume = true; // set flag so that SoundCommandParser::cmdUpdateCues will set the volume of the stream
}
}