Skip to content

Commit

Permalink
Fix #306333 - Various type of edits change the measure count
Browse files Browse the repository at this point in the history
After a modification, a re-layout is triggered starting at the beginning of the
system. The measure number of the first measure of the system is taken adding 1
to the measure number of the last measure of previous system. However it was not
taken into account whether that measure was excluded from measure count.
  • Loading branch information
njvdberg committed Jun 8, 2020
1 parent cc50e7a commit bb057bb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions libmscore/layout.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4530,8 +4530,8 @@ void Score::doLayoutRange(const Fraction& st, const Fraction& et)
if (sectionBreak && sectionBreak->startWithMeasureOne())
lc.measureNo = 0;
else
lc.measureNo = lc.nextMeasure->prevMeasure()->no() + 1; // will be adjusted later with respect
// to the user-defined offset.
lc.measureNo = lc.nextMeasure->prevMeasure()->no() // will be adjusted later with respect
+ (lc.nextMeasure->prevMeasure()->irregular() ? 0 : 1); // to the user-defined offset.
lc.tick = lc.nextMeasure->tick();
}
}
Expand Down

0 comments on commit bb057bb

Please sign in to comment.