Skip to content

Fix crash on open template #31522

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

Open
mike-spa wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −3
Open

Fix crash on open template #31522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/engraving/editing/edit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5988,9 +5988,6 @@ void Score::updateInstrumentChangeTranspositions(KeySigEvent& key, Staff* staff,
while (nextTick != -1) {
KeySigEvent e = kl->key(nextTick);
if (e.forInstrumentChange()) {
Measure* m = tick2measure(Fraction::fromTicks(nextTick));
Segment* s = m->tick2segment(Fraction::fromTicks(nextTick), SegmentType::KeySig);
track_idx_t track = staff->idx() * VOICES;
if (key.isAtonal() && !e.isAtonal()) {
e.setMode(KeyMode::NONE);
e.setConcertKey(Key::C);
Expand All @@ -6003,6 +6000,9 @@ void Score::updateInstrumentChangeTranspositions(KeySigEvent& key, Staff* staff,
e.setConcertKey(ckey);
e.setKey(nkey);
}
Measure* m = tick2measure(Fraction::fromTicks(nextTick));
Segment* s = m ? m->tick2segment(Fraction::fromTicks(nextTick), SegmentType::KeySig) : nullptr;
track_idx_t track = staff->idx() * VOICES;
KeySig* keySig = nullptr;
EngravingItem* keySigElem = s ? s->element(track) : nullptr;
if (keySigElem && keySigElem->isKeySig()) {
Expand Down
6 changes: 6 additions & 0 deletions src/notation/internal/masternotation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,12 @@ static void createMeasures(MasterScore* masterScore, const ScoreCreateOptions& s
keySigEvent.setConcertKey(scoreOptions.key);
}

// Ensure all key sigs that may have been in the template file are cleared
for (Staff* staff : masterScore->staves()) {
KeyList* keys = staff->keyList();
keys->clear();
}

const int totalMeasures = scoreOptions.withPickupMeasure ? scoreOptions.totalMeasures + 1 : scoreOptions.totalMeasures;
for (int i = 0; i < totalMeasures; ++i) {
MeasureBase* measureBase = masterScore->insertMeasure();
Expand Down
Loading