Fix undo error

Author: miiizen

src/engraving/editing/editmeasures.cpp

@@ -408,3 +408,21 @@ void ChangeMeasureRepeatCount::flip(EditData*)
     m->setMeasureRepeatCount(count, staffIdx);
     count = oldCount;
 }
+
+void ChangeMMRestNext::flip(EditData*)
+{
+    assert(m_mmrest->isMMRest());
+    MeasureBase* oldNext = m_mmrest->next();
+
+    m_mmrest->setNext(m_next);
+    m_next = oldNext;
+}
+
+void ChangeMMRestPrev::flip(EditData*)
+{
+    assert(m_mmrest->isMMRest());
+    MeasureBase* oldPrev = m_mmrest->prev();
+
+    m_mmrest->setPrev(m_prev);
+    m_prev = oldPrev;
+}

src/engraving/editing/editmeasures.h

@@ -110,6 +110,41 @@ class ChangeMMRest : public UndoableCommand
     UNDO_CHANGED_OBJECTS({ m, mmrest })
 };
 
+// ChangeMMRestNext & ChangeMMRestPrev SHOULD ONLY BE USED FOR MMRests
+// Setting m_next & m_prev involves the score's MeasureList for regular measures
+// This is handled through undo commands above
+class ChangeMMRestNext : public UndoableCommand
+{
+    OBJECT_ALLOCATOR(engraving, ChangeMMRestNext)
+
+    Measure* m_mmrest = nullptr;
+    MeasureBase* m_next = nullptr;
+
+    void flip(EditData*) override;
+public:
+    ChangeMMRestNext(Measure* mmrest, MeasureBase* next)
+        : m_mmrest(mmrest), m_next(next) {}
+
+    UNDO_NAME("ChangeMMRestNext")
+    UNDO_CHANGED_OBJECTS({ m_mmrest })
+};
+
+class ChangeMMRestPrev : public UndoableCommand
+{
+    OBJECT_ALLOCATOR(engraving, ChangeMMRestPrev)
+
+    Measure* m_mmrest = nullptr;
+    MeasureBase* m_prev = nullptr;
+
+    void flip(EditData*) override;
+public:
+    ChangeMMRestPrev(Measure* mmrest, MeasureBase* prev)
+        : m_mmrest(mmrest), m_prev(prev) {}
+
+    UNDO_NAME("ChangeMMRestPrev")
+    UNDO_CHANGED_OBJECTS({ m_mmrest })
+};
+
 class ChangeMeasureRepeatCount : public UndoableCommand
 {
     OBJECT_ALLOCATOR(engraving, ChangeMeasureRepeatCount)

src/engraving/rendering/score/mmrestlayout.cpp

@@ -214,8 +214,8 @@ void MMRestLayout::createMMRest(LayoutContext& ctx, Measure* firstMeasure, Measu
     changeMeasureElParents(firstMeasure, lastMeasure, mmrMeasure, ctx);
 
     MeasureBase* nm = ctx.conf().isShowVBox() ? lastMeasure->next() : lastMeasure->nextMeasure();
-    mmrMeasure->setNext(nm);
-    mmrMeasure->setPrev(firstMeasure->prev());
+    ctx.mutDom().undo(new ChangeMMRestNext(mmrMeasure, nm));
+    ctx.mutDom().undo(new ChangeMMRestPrev(mmrMeasure, firstMeasure->prev()));
 }
 
 void MMRestLayout::changeMeasureElParents(Measure* firstMeasure, Measure* lastMeasure, Measure* mmrMeasure, LayoutContext& ctx)
@@ -724,6 +724,7 @@ void MMRestLayout::createMultiMeasureRestsIfNeed(Measure* firstMeasure, LayoutCo
         Fraction len;
 
         while (validMMRestMeasure(ctx, measureToBeChecked)) {
+            LOGI() << "check: " << measureToBeChecked;
             if (n && breakMultiMeasureRest(ctx, measureToBeChecked)) {
                 break;
             }