[Scummvm-git-logs] scummvm master -> 6ff4c86a8e5361c3aa63debb98944ea8500e43e8

[elasota]

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:
6ff4c86a8e MTROPOLIS: Fix MIDI note cleanup crash


Commit: 6ff4c86a8e5361c3aa63debb98944ea8500e43e8
    https://github.com/scummvm/scummvm/commit/6ff4c86a8e5361c3aa63debb98944ea8500e43e8
Author: elasota (ejlasota at gmail.com)
Date: 2022-07-01T19:56:26-04:00

Commit Message:
MTROPOLIS: Fix MIDI note cleanup crash

Changed paths:
    engines/mtropolis/plugin/standard.cpp


diff --git a/engines/mtropolis/plugin/standard.cpp b/engines/mtropolis/plugin/standard.cpp
index 834fd7757d0..81c7feba0c2 100644
--- a/engines/mtropolis/plugin/standard.cpp
+++ b/engines/mtropolis/plugin/standard.cpp
@@ -844,7 +844,7 @@ void MidiCombinerDynamic::doAllNotesOff(uint sourceID, uint8 channel, uint8 para
 			if (sustainOn)
 				note._isSustainedBySustain = true;
 
-			tryCleanUpUnsustainedNote(rni);
+			tryCleanUpUnsustainedNote(noteIndex);
 		}
 	}
 
@@ -876,7 +876,7 @@ void MidiCombinerDynamic::doAllSoundOff(uint sourceID, uint8 channel, uint8 para
 			note._isSustainedBySostenuto = false;
 			note._isSustainedBySustain = false;
 
-			tryCleanUpUnsustainedNote(rni);
+			tryCleanUpUnsustainedNote(noteIndex);
 		}
 	}
 
@@ -915,7 +915,7 @@ void MidiCombinerDynamic::doResetAllControllers(uint sourceID, uint8 channel, ui
 			if (note._isSustainedBySostenuto || note._isSustainedBySustain) {
 				note._isSustainedBySostenuto = false;
 				note._isSustainedBySustain = false;
-				tryCleanUpUnsustainedNote(rni);
+				tryCleanUpUnsustainedNote(noteIndex);
 			}
 		}
 	}