[Scummvm-git-logs] scummvm master -> d82c3cea5fb25e82f8eb8bba4c637ad51d243b32

[AndywinXp]

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:
d82c3cea5f SCUMM: SMUSH/INSANE: Call resetAudioTracks() in the correct places (fix #13476)


Commit: d82c3cea5fb25e82f8eb8bba4c637ad51d243b32
    https://github.com/scummvm/scummvm/commit/d82c3cea5fb25e82f8eb8bba4c637ad51d243b32
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-05-19T13:51:59+02:00

Commit Message:
SCUMM: SMUSH/INSANE: Call resetAudioTracks() in the correct places (fix #13476)

Changed paths:
    engines/scumm/insane/insane_scenes.cpp
    engines/scumm/smush/smush_player.cpp


diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp
index 75d92affbca..067d75aac98 100644
--- a/engines/scumm/insane/insane_scenes.cpp
+++ b/engines/scumm/insane/insane_scenes.cpp
@@ -140,6 +140,7 @@ void Insane::runScene(int arraynum) {
 		error("Unknown FT_INSANE mode %d", readArray(0));
 	}
 
+	_player->resetAudioTracks();
 	putActors();
 	_enemy[EN_ROTT3].maxdamage = 120;
 
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 593a4e18581..f0a05496e9d 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -298,7 +298,6 @@ void SmushPlayer::init(int32 speed) {
 	_vm->_mixer->stopHandle(*_compressedFileSoundHandle);
 	_vm->_mixer->stopHandle(*_IACTchannel);
 	_IACTpos = 0;
-	resetAudioTracks();
 }
 
 void SmushPlayer::release() {
@@ -1300,6 +1299,8 @@ void SmushPlayer::initAudio(int samplerate, int32 maxChunkSize) {
 	_smushAudioSampleRate = samplerate;
 	_smushAudioInitialized = true;
 	_smushAudioCallbackEnabled = true;
+
+	resetAudioTracks();
 }
 
 void SmushPlayer::terminateAudio() {