Manually merged musescore#6415 to master

iveshenry18 · Sep 1, 2020 · f963708 · f963708
1 parent 74cc2ab
commit f963708
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -842,8 +842,9 @@ void Score::cmdAddTimeSig(Measure* fm, int staffIdx, TimeSig* ts, bool local)
                 std::pair<int, int> staffIdxRange = getStaffIdxRange(score);
                 for (int si = staffIdxRange.first; si < staffIdxRange.second; ++si) {
                     TimeSig* nsig = toTimeSig(seg->element(si * VOICES));
-                    if (!nsig)
+                    if (!nsig) {
                         continue;
+                    }
                     nsig->undoChangeProperty(Pid::SHOW_COURTESY, ts->showCourtesySig());
                     nsig->undoChangeProperty(Pid::TIMESIG, QVariant::fromValue(ts->sig()));
                     nsig->undoChangeProperty(Pid::TIMESIG_TYPE, int(ts->timeSigType()));
@@ -3450,7 +3451,7 @@ void Score::localTimeDelete()
     MeasureBase* ie;
 
     if (endSegment) {
-        ie = endSegment->prev() ? endSegment->measure() : endSegment->measure()->prev();
+        ie = endSegment->prev(SegmentType::ChordRest) ? endSegment->measure() : endSegment->measure()->prev();
     } else {
         ie = lastMeasure();
     }
@@ -3527,6 +3528,10 @@ void Score::localTimeDelete()
 
 void Score::timeDelete(Measure* m, Segment* startSegment, const Fraction& f)
 {
+    if (f.isZero()) {
+        return;
+    }
+
     const Fraction tick  = startSegment->rtick();
     const Fraction len   = f;
     const Fraction etick = tick + len;

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -3354,7 +3354,7 @@ void Score::selectRange(Element* e, int staffIdx)
                 }
                 ChordRest* ocr = toChordRest(oe);
 
-                Segment* endSeg = tick2segmentMM(ocr->segment()->tick() + ocr->actualTicks());
+                Segment* endSeg = tick2segmentMM(ocr->segment()->tick() + ocr->actualTicks(), true);
                 if (!endSeg) {
                     endSeg = ocr->segment()->next();
                 }