fix #276237: Crash after undo stave text entry and leaving edit mode

musescore · Sep 17, 2018 · 1d8adad · 1d8adad
1 parent 62800ec
commit 1d8adad
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp
@@ -77,6 +77,7 @@
 #include "stafflines.h"
 #include "bracket.h"
 #include "fret.h"
+#include "textedit.h"
 
 namespace Ms {
 
@@ -365,6 +366,13 @@ void UndoStack::setClean()
 void UndoStack::undo(EditData* ed)
       {
       qCDebug(undoRedo) << "===";
+      // Are we currently editing text?
+      if (ed && ed->element && ed->element->isTextBase()) {
+            TextEditData* ted = static_cast<TextEditData*>(ed->getData(ed->element));
+            if (ted && ted->startUndoIdx == curIdx)
+                  // No edits to undo, so do nothing
+                  return;
+            }
       if (curIdx) {
             --curIdx;
             Q_ASSERT(curIdx >= 0);