fix #267896: Crash when loading a capella score

musescore · Dec 26, 2017 · f553f4f · f553f4f
1 parent dfb24a3
commit f553f4f
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/mscore/capella.cpp b/mscore/capella.cpp
@@ -1333,16 +1333,27 @@ void convertCapella(Score* score, Capella* cap, bool capxMode)
                               }
                         }
                   if (empty) {
-                        Segment* s = m->getSegment(SegmentType::ChordRest, m->tick());
-                        Rest* rest = new Rest(score);
-                        TDuration d(m->len());
-                        if ((m->len() == m->timesig()) || !d.isValid())
+
+                        if ((m->len() == m->timesig())) {
+                              Segment* s = m->getSegment(SegmentType::ChordRest, m->tick());
+                              Rest* rest = new Rest(score);
                               rest->setDurationType(TDuration::DurationType::V_MEASURE);
-                        else
-                              rest->setDurationType(d.type());
-                        rest->setDuration(m->len());
-                        rest->setTrack(staffIdx * VOICES);
-                        s->add(rest);
+                              rest->setDuration(m->len());
+                              rest->setTrack(staffIdx * VOICES);
+                              s->add(rest);
+                              }
+                        else {
+                              auto durList = toDurationList(m->len(), true);
+                              int tickOffset = 0;
+                              for (auto d : durList) {
+                                    Segment* s = m->getSegment(SegmentType::ChordRest, m->tick() + tickOffset);
+                                    Rest* rest = new Rest(score);
+                                    rest->setDurationType(d);
+                                    rest->setTrack(staffIdx * VOICES);
+                                    s->add(rest);
+                                    tickOffset += d.ticks();
+                                    }
+                              }
                         }
                   }
             }