Merge pull request #12084 from Jojo-Schmitz/cmdIncDecDuration

[MU4] Fix #332925: Half duration shortcut crashes musescore when time signature is 5/4
musescore · May 23, 2023 · f3ce3c9 · f3ce3c9
2 parents b4dba9d + d618822
commit f3ce3c9
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/engraving/libmscore/cmd.cpp b/src/engraving/libmscore/cmd.cpp
@@ -2900,9 +2900,18 @@ void Score::cmdIncDecDuration(int nSteps, bool stepDotted)
 
     // if measure rest is selected as input, then the correct initialDuration will be the
     // duration of the measure's time signature, else is just the input state's duration
-    TDuration initialDuration
-        = (cr->durationType() == DurationType::V_MEASURE) ? TDuration(cr->measure()->timesig()) : _is.duration();
-    TDuration d = initialDuration.shiftRetainDots(nSteps, stepDotted);
+    TDuration initialDuration;
+    if (cr->durationType() == DurationType::V_MEASURE) {
+        initialDuration = TDuration(cr->measure()->timesig(), true);
+
+        if (initialDuration.fraction() < cr->measure()->timesig() && nSteps > 0) {
+            // Duration already shortened by truncation; shorten one step less
+            --nSteps;
+        }
+    } else {
+        initialDuration = _is.duration();
+    }
+    TDuration d = (nSteps != 0) ? initialDuration.shiftRetainDots(nSteps, stepDotted) : initialDuration;
     if (!d.isValid()) {
         return;
     }