fix #27431

musescore · Jul 9, 2014 · 44c17d9 · 44c17d9
1 parent d59cc84
commit 44c17d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/libmscore/chordrest.cpp b/libmscore/chordrest.cpp
@@ -98,7 +98,7 @@ ChordRest::ChordRest(const ChordRest& cr, bool link)
       _crossMeasure = cr._crossMeasure;
       _space        = cr._space;
 
-      foreach (Lyrics* l, cr._lyricsList) {        // make deep copy
+      for (Lyrics* l : cr._lyricsList) {        // make deep copy
             if (l == 0)
                   continue;
             Lyrics* nl = new Lyrics(*l);

diff --git a/libmscore/select.cpp b/libmscore/select.cpp
@@ -301,8 +301,10 @@ void Selection::updateSelectedElements()
                         continue;
                   if (e->isChordRest()) {
                         ChordRest* cr = static_cast<ChordRest*>(e);
-                        foreach (Element* e, cr->lyricsList())
-                              _el.append(e);
+                        for (Element* e : cr->lyricsList()) {
+                              if (e)
+                                    _el.append(e);
+                              }
                         }
                   if (e->type() == Element::Type::CHORD) {
                         Chord* chord = static_cast<Chord*>(e);