Fix #331840: Crash on creating a 4-or-higher tuplet on a 512th

or an 8-or-higher tuplet on a 256th
musescore · Jan 28, 2023 · 52c82e8 · 52c82e8
1 parent 03b6e76
commit 52c82e8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/notation/inotationinteraction.h b/src/notation/inotationinteraction.h
@@ -180,7 +180,7 @@ class INotationInteraction
     virtual void addBracketsToSelection(BracketsType type) = 0;
     virtual void changeSelectedNotesArticulation(SymbolId articulationSymbolId) = 0;
     virtual void addGraceNotesToSelectedNotes(GraceNoteType type) = 0;
-    virtual bool canAddTupletToSelectedChordRests() const = 0;
+    virtual bool canAddTupletToSelectedChordRests(int numerator) const = 0;
     virtual void addTupletToSelectedChordRests(const TupletOptions& options) = 0;
     virtual void addBeamToSelectedChordRests(BeamMode mode) = 0;
 

diff --git a/src/notation/internal/notationactioncontroller.cpp b/src/notation/internal/notationactioncontroller.cpp
@@ -825,7 +825,7 @@ void NotationActionController::putTuplet(const TupletOptions& options)
         return;
     }
 
-    if (!interaction->canAddTupletToSelectedChordRests()) {
+    if (!interaction->canAddTupletToSelectedChordRests(options.ratio.numerator())) {
         interactive()->error(trc("notation", "Cannot create tuplet"), trc("notation", "Note value is too short"));
         return;
     }

diff --git a/src/notation/internal/notationinteraction.cpp b/src/notation/internal/notationinteraction.cpp
@@ -3860,15 +3860,18 @@ void NotationInteraction::addGraceNotesToSelectedNotes(GraceNoteType type)
     apply();
 }
 
-bool NotationInteraction::canAddTupletToSelectedChordRests() const
+bool NotationInteraction::canAddTupletToSelectedChordRests(int n) const
 {
     for (ChordRest* chordRest : score()->getSelectedChordRests()) {
         if (chordRest->isGrace()) {
             continue;
         }
 
-        if (chordRest->durationType() < mu::engraving::TDuration(mu::engraving::DurationType::V_512TH)
-            && chordRest->durationType() != mu::engraving::TDuration(mu::engraving::DurationType::V_MEASURE)) {
+        if ((chordRest->durationType() < mu::engraving::TDuration(mu::engraving::DurationType::V_512TH)
+             && chordRest->durationType() != mu::engraving::TDuration(mu::engraving::DurationType::V_MEASURE))
+            || (chordRest->durationType() < mu::engraving::TDuration(mu::engraving::DurationType::V_256TH) && n > 3)
+            || (chordRest->durationType() < mu::engraving::TDuration(mu::engraving::DurationType::V_128TH) && n > 7)
+            ) {
             return false;
         }
     }

diff --git a/src/notation/internal/notationinteraction.h b/src/notation/internal/notationinteraction.h
@@ -186,7 +186,7 @@ class NotationInteraction : public INotationInteraction, public async::Asyncable
     void addBracketsToSelection(BracketsType type) override;
     void changeSelectedNotesArticulation(SymbolId articulationSymbolId) override;
     void addGraceNotesToSelectedNotes(GraceNoteType type) override;
-    bool canAddTupletToSelectedChordRests() const override;
+    bool canAddTupletToSelectedChordRests(int numerator) const override;
     void addTupletToSelectedChordRests(const TupletOptions& options) override;
     void addBeamToSelectedChordRests(BeamMode mode) override;