fix #59301 Deleting measure with clef change corrupts clef map

musescore · Jun 9, 2015 · 0cdde77 · 0cdde77
1 parent 55c0c4f
commit 0cdde77
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/libmscore/staff.cpp b/libmscore/staff.cpp
@@ -1036,7 +1036,8 @@ void Staff::insertTime(int tick, int len)
             m = m->prevMeasure();
             Segment* s = m->findSegment(Segment::Type::Clef, tick);
             if (s) {
-                  Clef* clef = static_cast<Clef*>(s->element(idx()));
+                  int track = idx() * VOICES;
+                  Clef* clef = static_cast<Clef*>(s->element(track));
                   if (clef)
                         setClef(clef);
                   }

diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp
@@ -3053,6 +3053,22 @@ void InsertRemoveMeasures::removeMeasures()
       score->fixTicks();
       if (fm->type() == Element::Type::MEASURE) {
             score->setPlaylistDirty();
+
+            // check if there is a clef at the end of last measure
+            // remove clef from staff cleflist
+
+            if (lm->type() == Element::Type::MEASURE) {
+                  Measure* m = static_cast<Measure*>(lm);
+                  Segment* s = m->findSegment(Segment::Type::Clef, tick2);
+                  if (s) {
+                        for (int staffIdx = 0; staffIdx <= score->nstaves(); ++staffIdx) {
+                              Clef* clef = static_cast<Clef*>(s->element(staffIdx * VOICES));
+                              if (clef)
+                                    score->staff(staffIdx)->removeClef(clef);
+                              }
+                        }
+                  }
+
             score->insertTime(tick1, -(tick2 - tick1));
             score->setLayoutAll(true);
             for (Spanner* sp : score->unmanagedSpanners())