fix #39801

musescore · Nov 27, 2014 · a3a54fb · a3a54fb
1 parent 7895c41
commit a3a54fb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/libmscore/groups.cpp b/libmscore/groups.cpp
@@ -76,6 +76,7 @@ Beam::Mode Groups::endBeam(ChordRest* cr, ChordRest* prev)
       const Groups& g = cr->staff()->group(cr->tick());
       Fraction stretch = cr->staff()->timeStretch(cr->tick());
       int tick = (cr->rtick() * stretch.numerator()) / stretch.denominator();
+
       Beam::Mode val = g.beamMode(tick, d.type());
 
       // context-dependent checks

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -471,9 +471,11 @@ void Score::fixTicks()
 
       for (Staff* staff : _staves)
             staff->clearTimeSig();
+
       TimeSigMap* smap = sigmap();
       Fraction sig(fm->len());
       Fraction nsig(fm->timesig());
+
       if (!parentScore()) {
             tempomap()->clear();
             smap->clear();
@@ -493,7 +495,7 @@ void Score::fixTicks()
             if (m->mmRest())
                   m->mmRest()->moveTicks(diff);
 
-            if (!parentScore()) {
+//            if (!parentScore()) {
                   //
                   //  implement section break rest
                   //
@@ -514,8 +516,8 @@ void Score::fixTicks()
                                           staff(staffIdx)->addTimeSig(ts);
                                     }
                               }
-                        else if (s->segmentType() == Segment::Type::ChordRest) {
-                              foreach(Element* e, s->annotations()) {
+                        else if (!parentScore() && (s->segmentType() == Segment::Type::ChordRest)) {
+                              foreach (Element* e, s->annotations()) {
                                     if (e->type() == Element::Type::TEMPO_TEXT) {
                                           const TempoText* tt = static_cast<const TempoText*>(e);
                                           setTempo(tt->segment(), tt->tempo());
@@ -543,7 +545,7 @@ void Score::fixTicks()
                                     }
                               }
                         }
-                  }
+//                  }
 
             //
             // update time signature map
@@ -552,6 +554,7 @@ void Score::fixTicks()
                   sig = m->len();
                   smap->add(tick, SigEvent(sig, m->timesig(),  m->no()));
                   }
+
             tick += measureTicks;
             }
       if (tempomap()->empty())

diff --git a/libmscore/staff.cpp b/libmscore/staff.cpp
@@ -272,6 +272,8 @@ TimeSig* Staff::timeSig(int tick) const
       auto i = timesigs.upper_bound(tick);
       if (i != timesigs.begin())
             --i;
+      else if (tick < i->first)
+            return 0;
       return (i == timesigs.end()) ? 0 : i->second;
       }
 
@@ -311,6 +313,15 @@ void Staff::removeTimeSig(TimeSig* timesig)
             timesigs.erase(timesig->segment()->tick());
       }
 
+//---------------------------------------------------------
+//   clearTimeSig
+//---------------------------------------------------------
+
+void Staff::clearTimeSig()
+      {
+      timesigs.clear();
+      }
+
 //---------------------------------------------------------
 //   Staff::key
 //

diff --git a/libmscore/staff.h b/libmscore/staff.h
@@ -160,7 +160,7 @@ class Staff : public QObject {
 
       void addTimeSig(TimeSig*);
       void removeTimeSig(TimeSig*);
-      void clearTimeSig()            { timesigs.clear(); }
+      void clearTimeSig();
       Fraction timeStretch(int tick) const;
       TimeSig* timeSig(int tick) const;
       const Groups& group(int tick) const;