fix #32826: end repeat on mmrest

musescore · Sep 15, 2014 · f13dfa6 · f13dfa6
1 parent 3338af9
commit f13dfa6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -1765,12 +1765,15 @@ void Score::createMMRests()
                   mmr->setNo(m->no());
                   mmr->setPageBreak(lm->pageBreak());
                   mmr->setLineBreak(lm->lineBreak());
-                  mmr->setRepeatFlags(m->repeatFlags());
 
-                  BarLineType t = lm->endBarLineGenerated() ? BarLineType::NORMAL : lm->endBarLineType();
+                  BarLineType t;
+                  if (lm->endBarLineGenerated() && !(lm->repeatFlags() & Repeat::END))
+                        t = BarLineType::NORMAL;
+                  else
+                        t = lm->endBarLineType();
                   mmr->setEndBarLineType(t, false, lm->endBarLineVisible(), lm->endBarLineColor());
 
-                  mmr->setRepeatFlags(m->repeatFlags());
+                  mmr->setRepeatFlags(m->repeatFlags() | lm->repeatFlags());
 
                   qDeleteAll(*mmr->el());
                   mmr->el()->clear();