Merge pull request #4593 from mattmcclinch/280937-lyrics-line

fix #280937: Lyrics with hyphen on two systems crashes the program when changing the instruments order
musescore · Jan 29, 2019 · 66eaf27 · 66eaf27
2 parents 8f2b5b5 + c5a6df0
commit 66eaf27
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libmscore/lyricsline.cpp b/libmscore/lyricsline.cpp
@@ -358,7 +358,7 @@ void LyricsLineSegment::layout()
             endOfSystem = (sys != system());
             // if next lyrics is on a different system, this line segment is at the end of its system:
             // do not adjust for next lyrics position
-            if (!endOfSystem) {
+            if (sys && !endOfSystem) {
                   qreal lyrX        = lyr->bbox().x();
                   qreal lyrXp       = lyr->pagePos().x();
                   qreal sysXp       = sys->pagePos().x();