Merge pull request #3398 from mattmcclinch/267041-editmode

fix #267041: Problems with clicking off of an item
musescore · Jan 20, 2018 · 50bc1f7 · 50bc1f7
2 parents 9d9cd89 + c0e2b66
commit 50bc1f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/libmscore/element.cpp b/libmscore/element.cpp
@@ -1813,7 +1813,8 @@ bool Element::edit(EditData& ed)
 void Element::startEditDrag(EditData& ed)
       {
       ElementEditData* eed = ed.getData(this);
-      eed->pushProperty(P_ID::USER_OFF);
+      if (eed)
+            eed->pushProperty(P_ID::USER_OFF);
       }
 
 //---------------------------------------------------------

diff --git a/mscore/events.cpp b/mscore/events.cpp
@@ -361,7 +361,7 @@ void ScoreView::mousePressEvent(QMouseEvent* ev)
                   break;
 
             case ViewState::EDIT: {
-                  if (editData.grips) {
+                  if (e == editData.element && editData.grips) {
                         qreal a = editData.grip[0].width() * 1.0;
                         for (int i = 0; i < editData.grips; ++i) {
                               if (editData.grip[i].adjusted(-a, -a, a, a).contains(editData.startMove)) {