fix #16173: Changing and introducing time signatrues after Inser One …

…Measure causes corruption
musescore · Jun 27, 2012 · 9767fb2 · 9767fb2
1 parent f677cc6
commit 9767fb2
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 11,327 deletions.
diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -487,18 +487,19 @@ void Score::cmdAddTimeSig(Measure* fm, int staffIdx, TimeSig* ts)
       Fraction ns  = ts->sig();
       int tick     = fm->tick();
       TimeSig* lts = staff(staffIdx)->timeSig(tick);
-      Fraction stretch, lsig;
+      Fraction stretch;
+      Fraction lsig;                // last signature
       if (lts) {
             stretch = lts->stretch();
             lsig    = lts->sig();
             }
       else {
             stretch.set(1,1);
-            lsig.set(4,4);
+            lsig.set(4,4);          // set to default
             }
 
       int track    = staffIdx * VOICES;
-      Segment* seg = fm->getSegment(SegTimeSig, tick);
+      Segment* seg = fm->undoGetSegment(SegTimeSig, tick);
       TimeSig* ots = static_cast<TimeSig*>(seg->element(track));
       if (ots) {
             //
@@ -512,6 +513,7 @@ void Score::cmdAddTimeSig(Measure* fm, int staffIdx, TimeSig* ts)
                   return;
                   }
             }
+#if 0
       else {
             //
             //  check for local timesig (only staff value changes)
@@ -525,6 +527,7 @@ void Score::cmdAddTimeSig(Measure* fm, int staffIdx, TimeSig* ts)
                   return;
                   }
             }
+#endif
       Measure* nfm = fm;
       if (ots && ots->sig() == ts->sig() && ots->stretch() == ts->stretch()) {
             //

diff --git a/libmscore/segment.cpp b/libmscore/segment.cpp
@@ -491,7 +491,7 @@ void Segment::add(Element* el)
                   if (_elist[track]) {
                         qDebug("Segment::add(%s) there is already an %s at %d track %d\n",
                            el->name(), _elist[track]->name(), tick(), track);
-                        // abort();
+                        abort();
                         return;
                         }
                   if (track % VOICES)

diff --git a/libmscore/staff.cpp b/libmscore/staff.cpp
@@ -250,6 +250,7 @@ Fraction Staff::timeStretch(int tick) const
 
 //---------------------------------------------------------
 //   timeSig
+//    lookup time signature before or at tick
 //---------------------------------------------------------
 
 TimeSig* Staff::timeSig(int tick) const