Merge pull request #33928 from mathesoncalum/main_ports

Porting 4.7.X PRs to main

Author: RomanPudashkin

src/engraving/dom/paste.cpp

@@ -316,7 +316,17 @@ bool Score::cmdRepeatListSelection()
             foundChords.emplace(sourceChord);
             is.setSegment(sourceChord->segment());
             is.moveToNextInputPos();
-            is.setDuration(sourceChord->durationType());
+
+            if (is.noteEntryMode()) {
+                // In note input mode - use the duration of from the note input panel (InputState)...
+                IF_ASSERT_FAILED(is.duration().isValid()) {
+                    LOGE() << "Invalid InputState duration";
+                    is.setDuration(sourceChord->durationType());
+                }
+            } else {
+                // Otherwise set it based on the duration of the previous chord...
+                is.setDuration(sourceChord->durationType());
+            }
         }
 
         NoteVal nval = n->noteVal();

src/engraving/dom/spanner.cpp

@@ -1395,7 +1395,12 @@ void Spanner::setTick(const Fraction& v)
 
 void Spanner::setTick2(const Fraction& f)
 {
-    setTicks(f - m_tick);
+    Fraction ticks = f - m_tick;
+    IF_ASSERT_FAILED(f >= m_tick) {
+        ticks = m_tick - f;
+        m_tick = f;
+    }
+    setTicks(ticks);
 }
 
 //---------------------------------------------------------

src/engraving/editing/edit.cpp

@@ -7514,7 +7514,11 @@ void Score::doUndoRemoveStaleTieJumpPoints(Tie* tie, bool undo)
 void Score::doUndoResetPartialSlur(Slur* slur, bool undo)
 {
     const size_t undoIdx = undoStack()->currentIndex();
-    if (!slur->startCR()->hasPrecedingJumpItem() && slur->isIncoming()) {
+
+    const ChordRest* startCR = slur ? slur->startCR() : nullptr;
+    IF_ASSERT_FAILED(startCR) {
+        LOGE() << "Slur is corrupted";
+    } else if (!startCR->hasPrecedingJumpItem() && slur->isIncoming()) {
         if (undo) {
             startCmd(TranslatableString("engraving", "Reset incoming partial slur"));
             slur->undoSetIncoming(false);
@@ -7524,7 +7528,10 @@ void Score::doUndoResetPartialSlur(Slur* slur, bool undo)
         }
     }
 
-    if (!slur->endCR()->hasFollowingJumpItem() && slur->isOutgoing()) {
+    const ChordRest* endCR = slur ? slur->endCR() : nullptr;
+    IF_ASSERT_FAILED(endCR) {
+        LOGE() << "Slur is corrupted";
+    } else if (!endCR->hasFollowingJumpItem() && slur->isOutgoing()) {
         if (undo) {
             startCmd(TranslatableString("engraving", "Reset outgoing partial slur"));
             slur->undoSetOutgoing(false);