Merge pull request #4317 from dmitrio95/34426-paste-linked-lyrics

fix #34426: Paste chords with lyrics to linked staves correctly
musescore · Dec 6, 2018 · 55e0dea · 55e0dea
2 parents ce6bdc8 + e0d73e1
commit 55e0dea
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -4411,6 +4411,16 @@ void Score::undoAddElement(Element* element)
 void Score::undoAddCR(ChordRest* cr, Measure* measure, int tick)
       {
       Q_ASSERT(!cr->isChord() || !(toChord(cr)->notes()).empty());
+      if (!cr->lyrics().empty()) {
+            // Add chordrest and lyrics separately for correct
+            // handling of adding lyrics to linked staves.
+            std::vector<Lyrics*> lyrics;
+            std::swap(lyrics, cr->lyrics());
+            undoAddCR(cr, measure, tick);
+            for (Lyrics* l : lyrics)
+                  undoAddElement(l);
+            return;
+            }
 
       Staff* ostaff = cr->staff();
       int strack    = ostaff->idx() * VOICES + cr->voice();