fix #26266

musescore · Jun 17, 2014 · 3083478 · 3083478
1 parent a774975
commit 3083478
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/libmscore/segment.h b/libmscore/segment.h
@@ -88,7 +88,7 @@ class Segment : public Element {
       mutable bool empty;           // cached value
       mutable bool _written;        // used for write()
 
-      SegmentType _segmentType;
+      SegmentType _segmentType { SegmentType::Invalid };
       int _tick;
       Spatium _extraLeadingSpace;
       Spatium _extraTrailingSpace;

diff --git a/libmscore/segmentlist.cpp b/libmscore/segmentlist.cpp
@@ -50,6 +50,24 @@ void SegmentList::check()
             ++n;
             }
       for (Segment* s = _first; s; s = s->next()) {
+            switch (s->segmentType()) {
+                  case SegmentType::Invalid:
+                  case SegmentType::Clef:
+                  case SegmentType::KeySig:
+                  case SegmentType::Ambitus:
+                  case SegmentType::TimeSig:
+                  case SegmentType::StartRepeatBarLine:
+                  case SegmentType::BarLine:
+                  case SegmentType::ChordRest:
+                  case SegmentType::Breath:
+                  case SegmentType::EndBarLine:
+                  case SegmentType::TimeSigAnnounce:
+                  case SegmentType::KeySigAnnounce:
+                        break;
+                  default:
+                        qFatal("SegmentList::check: invalid segment type 0x%x", int(s->segmentType()));
+                        break;
+                  }
             Segment* ss = s->next();
             while (ss) {
                   if (s == ss) {

diff --git a/libmscore/undo.cpp b/libmscore/undo.cpp
@@ -459,7 +459,7 @@ void Score::undoChangeKeySig(Staff* ostaff, int tick, int key)
             //
             Measure* lm = measure->nextMeasure();
             for (; lm; lm = lm->nextMeasure()) {
-                  Segment* s = lm->undoGetSegment(SegmentType::KeySig | SegmentType::KeySigAnnounce, lm->tick());
+                  Segment* s = lm->findSegment(SegmentType::KeySig | SegmentType::KeySigAnnounce, lm->tick());
                   if (!s)
                         continue;
                   KeySig* ks = static_cast<KeySig*>(s->element(track));