Merge pull request #4434 from dmitrio95/280215-element-destruction-ed…

…itdata fix #280215: reset edited element pointer in ScoreView on element destruction
musescore · Dec 18, 2018 · 410bc92 · 410bc92
2 parents c49e3c3 + a9a8608
commit 410bc92
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/libmscore/mscoreview.h b/libmscore/mscoreview.h
@@ -73,6 +73,8 @@ class MuseScoreView {
       virtual void lyricsMinus()  {}
       virtual void lyricsUnderscore()  {}
 
+      virtual void onElementDestruction(Element*) {}
+
       virtual const QRect geometry() const = 0;
       };
 

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -372,6 +372,8 @@ void Score::onElementDestruction(Element* e)
             return;
             }
       score->selection().remove(e);
+      for (MuseScoreView* v : score->viewer)
+            v->onElementDestruction(e);
       }
 
 //---------------------------------------------------------

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -4405,6 +4405,16 @@ Element* ScoreView::getEditElement()
       return editData.element;
       }
 
+//---------------------------------------------------------
+//   onElementDestruction
+//---------------------------------------------------------
+
+void ScoreView::onElementDestruction(Element* e)
+      {
+      if (editData.element == e)
+            editData.element = nullptr;
+      }
+
 //---------------------------------------------------------
 //   startNoteEntryMode
 //---------------------------------------------------------

diff --git a/mscore/scoreview.h b/mscore/scoreview.h
@@ -392,6 +392,7 @@ class ScoreView : public QWidget, public MuseScoreView {
       void setOmrView(OmrView* v)     { _omrView = v;    }
       FotoLasso* fotoLasso() const    { return _foto;    }
       Element* getEditElement();
+      void onElementDestruction(Element*) override;
 
       virtual Element* elementNear(QPointF);
 //      void editFretDiagram(FretDiagram*);