Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix old project migration bugs #17983

Merged
merged 3 commits into from Jun 26, 2023
Merged

Fix old project migration bugs #17983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aeba998
Remove unnecessary layout call for repositioning old items (they are …
mike-spa Jun 14, 2023
a923722
Unlock updates when migrating, otherwise the score will not be updated
mike-spa Jun 14, 2023
9ede1c5
code review correction
mike-spa Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/engraving/rw/read206/read206.cpp
View file
Open in desktop
Expand Up @@ -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;
}

Expand Down
2 changes: 2 additions & 0 deletions src/project/internal/notationproject.cpp
View file
Open in desktop
Expand Up @@ -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
Expand Down