[Scummvm-git-logs] scummvm master -> 9d2492b4f8efb34a357632f461ac0d99248b0292

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9d2492b4f8 DIRECTOR: stop sound before playing stream


Commit: 9d2492b4f8efb34a357632f461ac0d99248b0292
    https://github.com/scummvm/scummvm/commit/9d2492b4f8efb34a357632f461ac0d99248b0292
Author: Misty De Meo (mistydemeo at gmail.com)
Date: 2021-12-13T07:14:45+01:00

Commit Message:
DIRECTOR: stop sound before playing stream

Changed paths:
    engines/director/sound.cpp


diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index bbdcde5d3f..f66753b30c 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -81,6 +81,7 @@ void DirectorSound::playFile(Common::String filename, uint8 soundChannel) {
 	Audio::AudioStream *sound = af.getAudioStream(false, false, DisposeAfterUse::YES);
 
 	cancelFade(soundChannel);
+	stopSound(soundChannel);
 	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_channels[soundChannel - 1].handle, sound, -1, getChannelVolume(soundChannel));
 
 	// Set the last played sound so that cast member 0 in the sound channel doesn't stop this file.