Fixed a couple of crashes

musescore · Mar 2, 2022 · 74e962f · 74e962f
1 parent f6ae8b0
commit 74e962f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 1 deletion.
diff --git a/src/context/internal/globalcontext.cpp b/src/context/internal/globalcontext.cpp
@@ -66,6 +66,10 @@ Notification GlobalContext::currentMasterNotationChanged() const
 
 void GlobalContext::setCurrentNotation(const INotationPtr& notation)
 {
+    if (m_currentNotation == notation) {
+        return;
+    }
+
     doSetCurrentNotation(notation);
     m_currentNotationChanged.notify();
 }

diff --git a/src/engraving/libmscore/score.cpp b/src/engraving/libmscore/score.cpp
@@ -1843,6 +1843,11 @@ Measure* Score::crMeasure(int idx) const
 Measure* Score::lastMeasure() const
 {
     MeasureBase* mb = _measures.last();
+
+    if (!mb) {
+        return nullptr;
+    }
+
     while (mb && mb->type() != ElementType::MEASURE) {
         mb = mb->prev();
     }

diff --git a/src/engraving/playback/playbackmodel.cpp b/src/engraving/playback/playbackmodel.cpp
@@ -46,7 +46,7 @@ const InstrumentTrackId PlaybackModel::METRONOME_TRACK_ID = { 999, METRONOME_INS
 
 void PlaybackModel::load(Ms::Score* score, async::Channel<int, int, int, int> notationChangesRangeChannel)
 {
-    if (!score || score->measures()->empty()) {
+    if (!score || score->measures()->empty() || !score->lastMeasure()) {
         return;
     }
 
@@ -164,6 +164,11 @@ void PlaybackModel::updateSetupData()
     for (const Ms::Part* part : m_score->parts()) {
         for (const auto& pair : *part->instruments()) {
             InstrumentTrackId trackId = idKey(part->id(), pair.second->id().toStdString());
+
+            if (!trackId.isValid()) {
+                continue;
+            }
+
             m_setupResolver.resolveSetupData(pair.second, m_playbackDataMap[std::move(trackId)].setupData);
         }
     }
@@ -211,6 +216,10 @@ void PlaybackModel::updateEvents(const int tickFrom, const int tickTo, const int
 
                     InstrumentTrackId trackId = idKey(item);
 
+                    if (!trackId.isValid()) {
+                        continue;
+                    }
+
                     PlaybackContext& ctx = m_playbackCtxMap[trackId];
                     ctx.update(segment, segmentPositionTick);
 

diff --git a/src/engraving/types/types.h b/src/engraving/types/types.h
@@ -586,6 +586,11 @@ struct InstrumentTrackId {
 
         return instrumentId < other.instrumentId;
     }
+
+    bool isValid() const
+    {
+        return partId.isValid() && !instrumentId.empty();
+    }
 };
 
 using InstrumentTrackIdSet = std::unordered_set<InstrumentTrackId>;

diff --git a/src/playback/internal/playbackcontroller.cpp b/src/playback/internal/playbackcontroller.cpp
@@ -486,6 +486,11 @@ void PlaybackController::addTrack(const InstrumentTrackId& instrumentTrackId, co
     IF_ASSERT_FAILED(notationPlayback() && playback()) {
         return;
     }
+
+    if (!instrumentTrackId.isValid()) {
+        return;
+    }
+
     AudioInputParams inParams = audioSettings()->trackInputParams(instrumentTrackId);
     AudioOutputParams outParams = trackOutputParams(instrumentTrackId);
     mpe::PlaybackData playbackData = notationPlayback()->trackPlaybackData(instrumentTrackId);