Merge pull request #4009 from dmitrio95/fix-gtp-stafftext-crash

fix #277055: Add StaffText to a Segment instead of Measure when reading Guitar Pro files
musescore · Oct 13, 2018 · b2b38f7 · b2b38f7
2 parents 43a6111 + b1c111a
commit b2b38f7
Show file tree

Hide file tree

Showing 11 changed files with 1,278 additions and 9 deletions.
diff --git a/mscore/importgtp-gp4.cpp b/mscore/importgtp-gp4.cpp
@@ -753,9 +753,8 @@ bool GuitarPro4::read(QFile* fp)
                   Segment* s = measure->getSegment(SegmentType::ChordRest, measure->tick());
                   StaffText* st = new StaffText(score);
                   st->setPlainText(QString("Capo. fret ") + QString::number(capo));
-                  st->setParent(s);
                   st->setTrack(i * VOICES);
-                  measure->add(st);
+                  s->add(st);
                   }
 
             Channel* ch = instr->channel(0);

diff --git a/mscore/importgtp-gp5.cpp b/mscore/importgtp-gp5.cpp
@@ -567,9 +567,8 @@ bool GuitarPro5::readTracks()
                   Segment* s = measure->getSegment(SegmentType::ChordRest, measure->tick());
                   StaffText* st = new StaffText(score);
                   st->setPlainText(QString("Capo. fret ") + QString::number(capo));
-                  st->setParent(s);
                   st->setTrack(i * VOICES);
-                  measure->add(st);
+                  s->add(st);
                   }
 
             Channel* ch = instr->channel(0);

diff --git a/mscore/importgtp.cpp b/mscore/importgtp.cpp
@@ -1589,10 +1589,9 @@ bool GuitarPro2::read(QFile* fp)
                   StaffText* st = new StaffText(score);
 //                  st->setTextStyleType(TextStyleType::STAFF);
                   st->setPlainText(QString("Capo. fret ") + QString::number(capo));
-                  st->setParent(s);
                   st->setTrack(i * VOICES);
-                  measure->add(st);
-            }
+                  s->add(st);
+                  }
 
             Channel* ch = instr->channel(0);
             if (midiChannel == int(StaffTypes::PERC_DEFAULT)) {
@@ -2280,9 +2279,8 @@ bool GuitarPro3::read(QFile* fp)
                   StaffText* st = new StaffText(score);
 //                  st->setTextStyleType(TextStyleType::STAFF);
                   st->setPlainText(QString("Capo. fret ") + QString::number(capo));
-                  st->setParent(s);
                   st->setTrack(i * VOICES);
-                  measure->add(st);
+                  s->add(st);
                   }
 
             Channel* ch = instr->channel(0);

diff --git a/mtest/guitarpro/capo-fret.gp3 b/mtest/guitarpro/capo-fret.gp3