fix #149746 Undi actual duration change creates corruption

musescore · Apr 23, 2018 · 10af232 · 10af232
1 parent 287f99d
commit 10af232
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp
@@ -77,8 +77,6 @@
 #include "stafflines.h"
 #include "bracket.h"
 
-//      Q_LOGGING_CATEGORY(undoRedo, "undoRedo")
-
 namespace Ms {
 
 extern Measure* tick2measure(int tick);
@@ -1034,12 +1032,19 @@ void ChangeMeasureLen::flip(EditData*)
       // move EndBarLine and TimeSigAnnounce
       // to end of measure:
       //
-      int endTick = measure->tick() + len.ticks();
-      for (Segment* segment = measure->first(); segment; segment = segment->next()) {
-            if (segment->segmentType() != SegmentType::EndBarLine
-               && segment->segmentType() != SegmentType::TimeSigAnnounce)
+
+      Segment* s = measure->first();
+      std::list<Segment*> sl;
+      for (; s;) {
+            Segment* ns = s->next();
+            if (!s->isEndBarLineType() && !s->isTimeSigAnnounceType()) {
+                  s = ns;
                   continue;
-            segment->setTick(endTick);
+                  }
+            s->setRtick(len.ticks());
+            sl.push_back(s);
+            measure->remove(s);
+            s = ns;
             }
       measure->setLen(len);
       measure->score()->fixTicks();

diff --git a/mscore/debugger/debugger.cpp b/mscore/debugger/debugger.cpp
@@ -1272,7 +1272,7 @@ void RestView::setElement(Element* e)
 
       rb.sym->setValue(int(rest->sym()));
       rb.dotline->setValue(rest->getDotline());
-      rb.mmWidth->setValue(rest->mmWidth());
+      rb.mmWidth->setValue((rest->measure() && rest->measure()->isMMRest()) ? rest->mmWidth() : 0.0);
       rb.gap->setChecked(rest->isGap());
       }