Merge pull request #17983 from mike-spa/fixOldProjextMigrationBugs

Fix old project migration bugs
musescore · Jun 26, 2023 · 99abe65 · 99abe65
2 parents 0b14610 + 9ede1c5
commit 99abe65
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/engraving/rw/read206/read206.cpp b/src/engraving/rw/read206/read206.cpp
@@ -3447,13 +3447,6 @@ Err Read206::readScore(Score* score, XmlReader& e, ReadInOutData* out)
 
     compat::CompatUtils::doCompatibilityConversions(score->masterScore());
 
-    // fix positions
-    //    offset = saved offset - layout position
-    score->doLayout();
-    for (auto i : ctx.fixOffsets()) {
-        i.first->setOffset(i.second - i.first->pos());
-    }
-
     return Err::NoError;
 }
 

diff --git a/src/project/internal/notationproject.cpp b/src/project/internal/notationproject.cpp
@@ -215,10 +215,12 @@ mu::Ret NotationProject::doLoad(const io::path_t& path, const io::path_t& styleP
 
     // Migration
     if (migrator()) {
+        masterScore->lockUpdates(false); // because migration needs a second layout
         ret = migrator()->migrateEngravingProjectIfNeed(m_engravingProject);
         if (!ret) {
             return ret;
         }
+        masterScore->lockUpdates(true);
     }
 
     // Load style if present