Merge pull request #3920 from mattmcclinch/275834-drop-slur

fix #275834: crash when add slur to score
musescore · Sep 5, 2018 · ec64d90 · ec64d90
2 parents f50c777 + 5af04c4
commit ec64d90
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/mscore/dragdrop.cpp b/mscore/dragdrop.cpp
@@ -619,7 +619,11 @@ void ScoreView::dropEvent(QDropEvent* event)
                         delete editData.element;
                         break;
                   }
-            editData.element = 0;
+            // If the state was changed to ViewState::EDIT,
+            // (as a result of ScoreView::cmdAddSlur(), for example)
+            // then do not set editData.element to 0.
+            if (state != ViewState::EDIT)
+                  editData.element = 0;
             setDropTarget(0); // this also resets dropRectangle and dropAnchor
             score()->endCmd();
             // update input cursor position (must be done after layout)