Merge pull request #5374 from MarcSabatella/295357-lyrics-offset-parts

fix #295357: lyrics Y offset in parts lost on save/reload
musescore · Oct 14, 2019 · f100e6d · f100e6d
2 parents 2e7a18c + 30e1ea9
commit f100e6d
Show file tree

Hide file tree

Showing 4 changed files with 1,705 additions and 1 deletion.
diff --git a/libmscore/lyrics.cpp b/libmscore/lyrics.cpp
@@ -113,7 +113,8 @@ void Lyrics::read(XmlReader& e)
       if (!isStyled(Pid::OFFSET) && !e.pasteMode()) {
             // fix offset for pre-3.1 scores
             // 3.0: y offset was meaningless if autoplace is set
-            if (autoplace() && score()->mscoreVersion() < "3.1") {
+            QString version = masterScore()->mscoreVersion();
+            if (autoplace() && !version.isEmpty() && version < "3.1") {
                   QPointF off = propertyDefault(Pid::OFFSET).toPointF();
                   ryoffset() = off.y();
                   }