Merge pull request #23171 from RomanPudashkin/mm_rest_crash_fix_432

mm_rest_crash_fix_432
musescore · Jun 10, 2024 · e699c5a · e699c5a
2 parents 771e2f8 + 39e51eb
commit e699c5a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/engraving/playback/playbackmodel.cpp b/src/engraving/playback/playbackmodel.cpp
@@ -793,6 +793,10 @@ void PlaybackModel::notifyAboutChanges(const InstrumentTrackIdSet& oldTracks, co
 void PlaybackModel::removeTrackEvents(const InstrumentTrackId& trackId, const mpe::timestamp_t timestampFrom,
                                       const mpe::timestamp_t timestampTo)
 {
+    IF_ASSERT_FAILED(timestampFrom <= timestampTo) {
+        return;
+    }
+
     auto search = m_playbackDataMap.find(trackId);
 
     if (search == m_playbackDataMap.cend()) {
@@ -818,7 +822,7 @@ void PlaybackModel::removeTrackEvents(const InstrumentTrackId& trackId, const mp
 
     auto upperBound = trackPlaybackData.originEvents.upper_bound(timestampTo);
 
-    for (auto it = lowerBound; it != upperBound;) {
+    for (auto it = lowerBound; it != upperBound && it != trackPlaybackData.originEvents.end();) {
         it = trackPlaybackData.originEvents.erase(it);
     }
 }