Skip to content

Commit 0bc17a9

Browse files
committed
fix #22977
1 parent d2adf43 commit 0bc17a9

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

libmscore/layout.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,7 +2135,7 @@ void Score::layoutLinear()
21352135
qreal xo = 0;
21362136

21372137
Measure* fm = firstMeasure();
2138-
for(MeasureBase* m = first(); m != fm ; m = m->next()) {
2138+
for (MeasureBase* m = first(); m != fm ; m = m->next()) {
21392139
if (m->type() == Element::HBOX)
21402140
xo += point(static_cast<Box*>(m)->boxWidth());
21412141
}
@@ -2152,17 +2152,22 @@ void Score::layoutLinear()
21522152
curMeasure = curMeasure->next();
21532153
continue;
21542154
}
2155+
if (styleB(ST_createMultiMeasureRests) && t == Element::MEASURE) {
2156+
Measure* m = static_cast<Measure*>(mb);
2157+
if (m->hasMMRest())
2158+
mb = m->mmRest();
2159+
}
21552160
mb->setSystem(system);
21562161
system->measures().append(mb);
21572162
}
21582163
if (system->measures().isEmpty())
21592164
return;
2160-
addSystemHeader(firstMeasure(), true);
2161-
removeGeneratedElements(firstMeasure(), lastMeasure());
2165+
addSystemHeader(firstMeasureMM(), true);
2166+
removeGeneratedElements(firstMeasureMM(), lastMeasureMM());
21622167

21632168
QPointF pos(0.0, 0.0);
21642169
bool isFirstMeasure = true;
2165-
foreach(MeasureBase* mb, system->measures()) {
2170+
foreach (MeasureBase* mb, system->measures()) {
21662171
qreal w = 0.0;
21672172
if (mb->type() == Element::MEASURE) {
21682173
if(isFirstMeasure) {

0 commit comments

Comments
 (0)