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 #272172: Remove tuplets after inserting measures causes corruption/crash #3662

Merged
merged 1 commit into from
May 21, 2018
Merged

fix #272172: Remove tuplets after inserting measures causes corruption/crash #3662

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
14 changes: 13 additions & 1 deletion libmscore/measure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,13 +972,25 @@ void Measure::spatiumChanged(qreal /*oldValue*/, qreal /*newValue*/)

void Measure::moveTicks(int diff)
{
std::set<Tuplet*> tuplets;
setTick(tick() + diff);
for (Segment* segment = last(); segment; segment = segment->prev()) {
if (segment->segmentType() & (SegmentType::EndBarLine | SegmentType::TimeSigAnnounce))
segment->setTick(tick() + ticks());
else if (segment->isChordRestType())
break;
// Tuplet ticks are stored as absolute ticks, so they must be adjusted.
// But each tuplet must only be adjusted once.
for (Element* e : segment->elist())
if (e) {
ChordRest* cr = toChordRest(e);
Tuplet* tuplet = cr->tuplet();
if (tuplet && tuplets.count(tuplet) == 0) {
tuplet->setTick(tuplet->tick() + diff);
tuplets.insert(tuplet);
}
}
}
tuplets.clear();
}

//---------------------------------------------------------
Expand Down