Fix clef order after headers

musescore · Feb 28, 2025 · b6e814e · b6e814e
1 parent 435802e
commit b6e814e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/engraving/dom/segment.cpp b/src/engraving/dom/segment.cpp
@@ -2847,14 +2847,20 @@ bool Segment::goesBefore(const Segment* nextSegment) const
     }
 
     if (thisIsClef && (nextIsKeySig || nextIsTimeSig)
-        && rtick() == Fraction(0, 1) && nextSegment->rtick() == Fraction(0, 1) && !nextIsHeader) {
+        && rtick()
+        == Fraction(0,
+                    1) && nextSegment->rtick() == Fraction(0, 1) && !nextIsHeader && thisMeasureIsStartRepeat && prevMeasureIsEndRepeat) {
         // Between repeats
+        LOGI() << "1. BETWEEN REPEATS";
         return true;
     }
 
     if ((thisIsKeySig || thisIsTimeSig) && nextIsClef
-        && rtick() == Fraction(0, 1) && nextSegment->rtick() == Fraction(0, 1) && !thisIsHeader) {
+        && rtick()
+        == Fraction(0,
+                    1) && nextSegment->rtick() == Fraction(0, 1) && !thisIsHeader && thisMeasureIsStartRepeat && prevMeasureIsEndRepeat) {
         // Between repeats
+        LOGI() << "2. BETWEEN REPEATS";
         return false;
     }
 

diff --git a/vtest/scores/clefPosition.mscz b/vtest/scores/clefPosition.mscz