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

Merge pull request #2257 from MarcSabatella/83441-copy-chord-crash

Browse source 
fix #83441: crash on paste of chord symbols past end of score
This commit is contained in:
Nicolas Froment 2015-10-19 11:36:27 +02:00
commit afddf4040c
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libmscore/paste.cpp
View file

@ -584,6 +584,7 @@ void Score::pasteSymbols(XmlReader& e, ChordRest* dst)
int startTick = dst->tick(); // the initial tick and track where to start pasting
int startTrack = dst->track();
int maxTrack = ntracks();
int lastTick = lastSegment()->tick();
while (e.readNextStartElement()) {
if (done)
@ -621,12 +622,15 @@ void Score::pasteSymbols(XmlReader& e, ChordRest* dst)
harmSegm = harmSegm->nextCR())
;
// if destTick overshot, no dest. segment: create one
if (!harmSegm || harmSegm->tick() > destTick) {
if (destTick >= lastTick) {
harmSegm = nullptr;
}
else if (!harmSegm || harmSegm->tick() > destTick) {
Measure* meas = tick2measure(destTick);
harmSegm = meas->getSegment(Segment::Type::ChordRest, destTick);
harmSegm = meas ? meas->getSegment(Segment::Type::ChordRest, destTick) : nullptr;
}
if (destTrack >= maxTrack) {
qDebug("PasteSymbols: no track for %s", tag.toUtf8().data());
if (destTrack >= maxTrack || harmSegm == nullptr) {
qDebug("PasteSymbols: no track or segment for %s", tag.toUtf8().data());
e.skipCurrentElement(); // ignore
continue;
}