fix #39751: selection / deletion of chord symbols

musescore · Nov 23, 2014 · 305a7b1 · 305a7b1
1 parent 5382ede
commit 305a7b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -1791,6 +1791,9 @@ void Score::cmdDeleteSelection()
                               continue;
                               }
                         foreach (Element* annotation, s->annotations()) {
+                              // skip if not included in selection (eg, filter)
+                              if (!selectionFilter().canSelect(annotation))
+                                    continue;
                               if (!annotation->systemFlag() && annotation->track() == track)
                                     undoRemoveElement(annotation);
                               }

diff --git a/libmscore/select.cpp b/libmscore/select.cpp
@@ -458,6 +458,13 @@ qDebug("updateSelectedElements");
             for (Segment* s = _startSegment; s && (s != _endSegment); s = s->next1MM()) {
                   if (s->segmentType() == Segment::Type::EndBarLine)  // do not select end bar line
                         continue;
+                  foreach(Element* e, s->annotations()) {
+                        if (e->track() != st)
+                              continue;
+                        if (e->systemFlag()) //exclude system text
+                              continue;
+                        appendFiltered(e);
+                        }
                   Element* e = s->element(st);
                   if (!e)
                         continue;
@@ -483,13 +490,6 @@ qDebug("updateSelectedElements");
                   else {
                         appendFiltered(e);
                         }
-                  foreach(Element* e, s->annotations()) {
-                        if (e->track() < startTrack || e->track() >= endTrack)
-                              continue;
-                        if (e->systemFlag()) //exclude system text
-                              continue;
-                        appendFiltered(e);
-                        }
                   }
             }
       int stick = startSegment()->tick();