LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix #81451: [Capella Import] corrupt file when importing capx file with pickup measure

Browse source
This commit is contained in:
lasconic 2017-02-21 12:23:12 +01:00
parent 7b6c0540b2
commit 99c15fdccd
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mscore/capella.cpp
View file

@ -849,11 +849,20 @@ static int readCapVoice(Score* score, CapVoice* cvoice, int staffIdx, int tick,
SigEvent ne(f);
if (!(se == ne))
score->sigmap()->add(tick, ne);
// do not add timesig again
Measure* m = score->getCreateMeasure(tick);
Segment* s = m->findSegment(Segment::Type::TimeSig, tick);
if (s) {
Element* e = s->element(trackZeroVoice(track));
if (e && static_cast<TimeSig*>(e)->sig() == f)
break;
}
TimeSig* ts = new TimeSig(score);
ts->setSig(f);
ts->setTrack(track);
Measure* m = score->getCreateMeasure(tick);
Segment* s = m->getSegment(Segment::Type::TimeSig, tick);
s = m->getSegment(Segment::Type::TimeSig, tick);
s->add(ts);
m->setLen(f);
}