Remove unused parameter isCmdFromInspector from Score::endCmd

And therewith probably fixed bug in scorefile.cpp:279.
iveshenry18 · Jun 30, 2021 · 00c603c · 00c603c
1 parent 1dca155
commit 00c603c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/engraving/libmscore/cmd.cpp b/src/engraving/libmscore/cmd.cpp
@@ -85,6 +85,7 @@
 #include "tremolo.h"
 #include "rehearsalmark.h"
 #include "sym.h"
+#include "log.h"
 
 using namespace mu;
 
@@ -273,13 +274,14 @@ void Score::undoRedo(bool undo, EditData* ed)
 ///   and (always) updating the redraw area.
 //---------------------------------------------------------
 
-void Score::endCmd(const bool isCmdFromInspector, bool rollback)
+void Score::endCmd(bool rollback)
 {
     if (!undoStack()->active()) {
-        qDebug("Score::endCmd(): no cmd active");
+        LOGW() << "no command active";
         update();
         return;
     }
+
     if (readOnly() || MScore::_error != MsError::MS_NO_ERROR) {
         rollback = true;
     }
@@ -290,16 +292,16 @@ void Score::endCmd(const bool isCmdFromInspector, bool rollback)
 
     update(false);
 
-    if (MScore::debugMode) {
-        qDebug("===endCmd() %d", undoStack()->current()->childCount());
-    }
-    const bool noUndo = undoStack()->current()->empty();         // nothing to undo?
+    LOGD() << "Undo stack current macro child count: " << undoStack()->current()->childCount();
+
+    const bool noUndo = undoStack()->current()->empty(); // nothing to undo?
     undoStack()->endMacro(noUndo);
 
     if (dirty()) {
-        masterScore()->setPlaylistDirty();      // TODO: flag individual operations
+        masterScore()->setPlaylistDirty(); // TODO: flag individual operations
         masterScore()->setAutosaveDirty(true);
     }
+
     cmdState().reset();
 }
 

diff --git a/src/engraving/libmscore/score.h b/src/engraving/libmscore/score.h
@@ -805,8 +805,8 @@ class Score : public QObject, public ScoreElement
     bool checkTimeDelete(Segment*, Segment*);
     void timeDelete(Measure*, Segment*, const Fraction&);
 
-    void startCmd();                            // start undoable command
-    void endCmd(const bool isCmdFromInspector = false, bool rollback = false);       // end undoable command
+    void startCmd();                    // start undoable command
+    void endCmd(bool rollback = false); // end undoable command
     void update() { update(true); }
     void undoRedo(bool undo, EditData*);
 

diff --git a/src/notation/internal/notationundostack.cpp b/src/notation/internal/notationundostack.cpp
@@ -106,7 +106,7 @@ void NotationUndoStack::rollbackChanges()
         return;
     }
 
-    score()->endCmd(false, true);
+    score()->endCmd(true);
     masterScore()->setSaved(isStackClean());
 
     notifyAboutStateChanged();