Don't add duplicate segs to the end of measure

musescore · Feb 28, 2025 · 5a12294 · 5a12294
1 parent 2c0b17f
commit 5a12294
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/engraving/rendering/score/modifydom.cpp b/src/engraving/rendering/score/modifydom.cpp
@@ -329,6 +329,7 @@ void ModifyDom::sortMeasureSegments(Measure* measure, LayoutContext& ctx)
     }
 
     std::vector<Segment*> segsToMoveToThisMeasure;
+    std::vector<Segment*> segsToRemove;
     for (Segment& seg : nextMeasure->segments()) {
         if (seg.tick() != nextMeasure->tick() || seg.isChordRestType()) {
             continue;
@@ -361,10 +362,19 @@ void ModifyDom::sortMeasureSegments(Measure* measure, LayoutContext& ctx)
         // Move key sigs and time sigs at the start of the next measure to the end of this measure
         if ((seg.isTimeSigType() || seg.isKeySigType()) && !seg.header() && !seg.trailer()
             && sigsShouldBeInThisMeasure && changeAppliesToRepeatAndContinuation(seg)) {
+            if (measure->findSegmentR(seg.segmentType(), measure->ticks())) {
+                segsToRemove.push_back(&seg);
+                continue;
+            }
             segsToMoveToThisMeasure.push_back(&seg);
         }
     }
 
+    for (Segment* seg : segsToRemove) {
+        // Don't add duplicate segs to the end of a measure
+        ctx.mutDom().doUndoRemoveElement(seg);
+    }
+
     for (Segment* seg : segsToMoveToNextMeasure) {
         seg->setRtick(Fraction(0, 1));
         seg->setEndOfMeasureChange(false);