fix #23879: unlink chord symbols within score/part

Don't duplicate chord symbols between linked staves within a score/part. Treat staff text similarly.
musescore · Dec 12, 2013 · 173e640 · 173e640
1 parent c67a0ae
commit 173e640
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/libmscore/excerpt.cpp b/libmscore/excerpt.cpp
@@ -404,10 +404,18 @@ void cloneStaff(Staff* srcStaff, Staff* dstStaff)
                                           continue;
                                     if (e->track() != srcTrack)
                                           continue;
-                                    Element* ne = e->clone();
-                                    ne->setTrack(dstTrack);
-                                    ne->setParent(seg);
-                                    score->undoAddElement(ne);
+                                    switch (e->type()) {
+                                          // exclude certain element types
+                                          // this should be same list excluded in Score::undoAddElement()
+                                          case Element::STAFF_TEXT:
+                                          case Element::HARMONY:
+                                                continue;
+                                          default:
+                                                Element* ne = e->clone();
+                                                ne->setTrack(dstTrack);
+                                                ne->setParent(seg);
+                                                score->undoAddElement(ne);
+                                          }
                                     }
                               if (oe->type() == Element::CHORD) {
                                     Chord* och = static_cast<Chord*>(ocr);

diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp
@@ -938,6 +938,17 @@ void Score::undoAddElement(Element* element)
             if (staff == ostaff)
                   ne = element;
             else {
+                  if (staff->rstaff() != ostaff->rstaff()) {
+                        switch (element->type()) {
+                              // exclude certain element types except on corresponding staff in part
+                              // these should be same list excluded in cloneStaff()
+                              case Element::STAFF_TEXT:
+                              case Element::HARMONY:
+                                    continue;
+                              default:
+                                    break;
+                              }
+                        }
                   ne = element->linkedClone();
                   ne->setScore(score);
                   ne->setSelected(false);