Merge pull request #25264 from miiizen/25257-join-crash

Fix crash on join measures containing parts
musescore · Oct 23, 2024 · 273ebc8 · 273ebc8
2 parents 5a75567 + e091fcd
commit 273ebc8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/engraving/dom/excerpt.cpp b/src/engraving/dom/excerpt.cpp
@@ -1660,7 +1660,7 @@ void Excerpt::cloneStaff2(Staff* srcStaff, Staff* dstStaff, const Fraction& star
         for (Segment& seg : nm->segments()) {
             seg.checkEmpty();
             if (seg.empty()) {
-                score->removeElement(&seg);
+                score->doUndoRemoveElement(&seg);
             }
         }
         if (!nm->hasVoices(dstStaffIdx, nm->tick(), nm->ticks())) {

diff --git a/src/engraving/dom/joinMeasure.cpp b/src/engraving/dom/joinMeasure.cpp
@@ -115,11 +115,9 @@ void MasterScore::joinMeasure(const Fraction& tick1, const Fraction& tick2)
     }
 
     MeasureBase* next = m2->next();
-    for (Score* s : scoreList()) {
-        Measure* sM1 = s->tick2measure(startTick);
-        Measure* sM2 = s->tick2measure(m2->tick());
-        s->deleteMeasures(sM1, sM2, true);
-    }
+    Measure* deleteStart = tick2measure(startTick);
+    Measure* deleteEnd = tick2measure(m2->tick());
+    deleteMeasures(deleteStart, deleteEnd, true);
     InsertMeasureOptions options;
     options.createEmptyMeasures = true;
     options.moveSignaturesClef = false;

diff --git a/src/engraving/dom/measure.cpp b/src/engraving/dom/measure.cpp
@@ -763,7 +763,6 @@ void Measure::add(EngravingItem* e)
         while (s && s->rtick() == t) {
             if (!seg->isChordRestType() && (seg->segmentType() == s->segmentType())) {
                 LOGD("there is already a <%s> segment", seg->subTypeName());
-                return;
             }
             if (seg->goesBefore(s)) {
                 break;