[Scummvm-git-logs] scummvm master -> 43f9e6183db965ff30040730ea9c56cb9071225f

[bluegr]

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:
43f9e6183d SCUMM: Fix CMS not playing a music midi track again


Commit: 43f9e6183db965ff30040730ea9c56cb9071225f
    https://github.com/scummvm/scummvm/commit/43f9e6183db965ff30040730ea9c56cb9071225f
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-01-10T12:13:16+02:00

Commit Message:
SCUMM: Fix CMS not playing a music midi track again

Possible fix for bug #10696

Changed paths:
    engines/scumm/players/player_v2cms.cpp


diff --git a/engines/scumm/players/player_v2cms.cpp b/engines/scumm/players/player_v2cms.cpp
index eceae818ab4..888af76fdbe 100644
--- a/engines/scumm/players/player_v2cms.cpp
+++ b/engines/scumm/players/player_v2cms.cpp
@@ -98,6 +98,7 @@ void Player_V2CMS::stopAllSounds() {
 	}
 	_next_nr = _current_nr = 0;
 	_next_data = _current_data = nullptr;
+	_loadedMidiSong = 0;
 	_midiData = nullptr;
 	_midiSongBegin = nullptr;
 	_midiDelay = 0;
@@ -121,6 +122,7 @@ void Player_V2CMS::stopSound(int nr) {
 		chainNextSound();
 	}
 	if (_loadedMidiSong == nr) {
+		_loadedMidiSong = 0;
 		_midiData = nullptr;
 		_midiSongBegin = nullptr;
 		_midiDelay = 0;