Merge pull request #2042 from MarcSabatella/62961-multi-hairpin

fix #62961: multiple hairpins added on list selection
musescore · Jun 4, 2015 · 10a72eb · 10a72eb
2 parents e0c4c66 + 3571429
commit 10a72eb
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -4329,7 +4329,9 @@ void ScoreView::cmdAddHairpin(bool decrescendo)
             _score->endCmd();
             _score->startCmd();
             }
-      else {
+      else if (selection.isRange() || selection.isSingle()) {
+            // for single staff range selection, or single selection,
+            // find start & end elements elements
             ChordRest* cr1;
             ChordRest* cr2;
             _score->getSelectedChordRest2(&cr1, &cr2);
@@ -4357,6 +4359,11 @@ void ScoreView::cmdAddHairpin(bool decrescendo)
                         _score->endCmd();
                   }
             }
+      else {
+            // do not attempt for list selection
+            // or we will keep adding hairpins to the same chordrests
+            return;
+            }
       }
 
 //---------------------------------------------------------