Merge pull request #4077 from mattmcclinch/277564-add-slur

fix #277564: Strange slur is added when pressing S on the score's last note
musescore · Oct 30, 2018 · 3432cc5 · 3432cc5
1 parent 9828f50
commit 3432cc5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -3110,7 +3110,7 @@ void ScoreView::addSlur()
                         if (!cr2 || cr2->tick() < cr->tick())
                               cr2 = cr;
                         }
-                  if (cr1)
+                  if (cr1 && (cr1 != cr2))
                         cmdAddSlur(cr1, cr2);
                   }
             }
@@ -3145,7 +3145,7 @@ void ScoreView::cmdAddSlur(ChordRest* cr1, ChordRest* cr2)
       if (cr2 == 0) {
             cr2 = nextChordRest(cr1);
             if (cr2 == 0)
-                  cr2 = cr1;
+                  return;
             startEditMode = true;      // start slur in edit mode if last chord is not given
             }