[Scummvm-git-logs] scummvm master -> 912f9b7cef1722994e16cbf24d56eff2819a350c

[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:
912f9b7cef NEVERHOOD: Handle sound 3 when deleting a sound group (bug #12930)


Commit: 912f9b7cef1722994e16cbf24d56eff2819a350c
    https://github.com/scummvm/scummvm/commit/912f9b7cef1722994e16cbf24d56eff2819a350c
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2021-09-30T01:00:13+03:00

Commit Message:
NEVERHOOD: Handle sound 3 when deleting a sound group (bug #12930)

It's consistent with how sounds 1 and 2 are handled, and seems to fix
bug #12930, where the game can crash on exit otherwise.

Changed paths:
    engines/neverhood/sound.cpp


diff --git a/engines/neverhood/sound.cpp b/engines/neverhood/sound.cpp
index db22b72289..eb55fde45c 100644
--- a/engines/neverhood/sound.cpp
+++ b/engines/neverhood/sound.cpp
@@ -421,6 +421,11 @@ void SoundMan::deleteSoundGroup(uint32 groupNameHash) {
 		_soundIndex2 = -1;
 	}
 
+	if (_soundIndex3 != -1 && _soundItems[_soundIndex3]->getGroupNameHash() == groupNameHash) {
+		deleteSoundByIndex(_soundIndex3);
+		_soundIndex3 = -1;
+	}
+
 	for (uint index = 0; index < _soundItems.size(); ++index)
 		if (_soundItems[index] && _soundItems[index]->getGroupNameHash() == groupNameHash)
 			deleteSoundByIndex(index);