Merge pull request #3101 from ericfont/Prevent-256th-rests-from-Q-or-…

…ShiftQ 2.1 fix to prevent Q or Shift+Q from resulting in 256th rests
musescore · Mar 24, 2017 · ab899a0 · ab899a0
2 parents cf5a1d7 + aeee109
commit ab899a0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/libmscore/durationtype.cpp b/libmscore/durationtype.cpp
@@ -304,7 +304,10 @@ void TDuration::shiftType(int nSteps, bool stepDotted)
                   newValue = int(_val) + nSteps;
                   }
 
-            if ((newValue < int(DurationType::V_LONG)) || (newValue > int(DurationType::V_128TH)))
+            if ((newValue < int(DurationType::V_LONG)) || (newValue > int(DurationType::V_128TH)) ||
+                ((newValue >= int(DurationType::V_128TH)) && (newDots >= 1)) ||
+                ((newValue >= int(DurationType::V_64TH))  && (newDots >= 2)) ||
+                ((newValue >= int(DurationType::V_32ND))  && (newDots >= 3)))
                   setType(DurationType::V_INVALID);
             else {
                   setType(DurationType(newValue));