fix #24852: ignore inactive segments (TimeTick) when calculating ferm…

…ata duration
musescore · Sep 26, 2024 · 2058077 · 2058077
1 parent 4558ed6
commit 2058077
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/engraving/dom/score.cpp b/src/engraving/dom/score.cpp
@@ -579,20 +579,26 @@ void Score::rebuildTempoAndTimeSigMaps(Measure* measure, std::optional<BeatsPerS
                     }
                 }
             }
-            if (!RealIsNull(stretch) && !RealIsNull(stretch)) {
+
+            if (!RealIsNull(stretch) && !RealIsEqual(stretch, 1.0)) {
                 BeatsPerSecond otempo = tempomap()->tempo(segment.tick().ticks());
                 BeatsPerSecond ntempo = otempo.val / stretch;
                 tempomap()->setTempo(segment.tick().ticks(), ntempo);
 
-                Fraction currentSegmentEndTick;
+                Fraction tempoEndTick;
+
+                const Segment* nextActiveSegment = segment.next1();
+                while (nextActiveSegment && !nextActiveSegment->isActive()) {
+                    nextActiveSegment = nextActiveSegment->next1();
+                }
 
-                if (segment.next1()) {
-                    currentSegmentEndTick = segment.next1()->tick();
+                if (nextActiveSegment) {
+                    tempoEndTick = nextActiveSegment->tick();
                 } else {
-                    currentSegmentEndTick = segment.tick() + segment.ticks();
+                    tempoEndTick = segment.tick() + segment.ticks();
                 }
 
-                Fraction etick = currentSegmentEndTick - Fraction(1, 480 * 4);
+                Fraction etick = tempoEndTick - Fraction(1, 480 * 4);
                 auto e = tempomap()->find(etick.ticks());
                 if (e == tempomap()->end()) {
                     tempomap()->setTempo(etick.ticks(), otempo);