fix #287432: Key signature appears in multimeasure rest after being d…

…eleted from underlying measure
musescore · Jun 17, 2019 · 2975006 · 2975006
1 parent 21cac7b
commit 2975006
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -1820,15 +1820,16 @@ void Score::createMMRest(Measure* m, Measure* lm, const Fraction& len)
                   if (s)
                         s->setRtick(len);
                   }
+            mmr->removeSystemTrailer();
             }
       else {
             mmr = new Measure(this);
             mmr->setTicks(len);
             mmr->setTick(m->tick());
-            mmr->setPageBreak(lm->pageBreak());
-            mmr->setLineBreak(lm->lineBreak());
             undo(new ChangeMMRest(m, mmr));
             }
+      mmr->setPageBreak(lm->pageBreak());
+      mmr->setLineBreak(lm->lineBreak());
       mmr->setMMRestCount(n);
       mmr->setNo(m->no());
 

diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -4011,7 +4011,7 @@ void Measure::removeSystemTrailer()
             changed = true;
             }
       setTrailer(false);
-      if (changed)
+      if (system() && changed)
             computeMinWidth();
       }