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

fix #234591: crash by removing any instrument or staff from a template

Browse source
This commit is contained in:
Werner Schweer 2017-07-21 15:20:11 +02:00
parent c8a0d9d589
commit f2c88cfd22
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libmscore/staff.cpp
View file

@ -1026,7 +1026,7 @@ void Staff::init(const InstrumentTemplate* t, const StaffType* staffType, int ci
setSmall(0, false);
}
else {
setSmall(0, t->smallStaff[cidx]);
setSmall(0, t->smallStaff[cidx]);
setBracketType(0, t->bracket[cidx]);
setBracketSpan(0, t->bracketSpan[cidx]);
setBarLineSpan(t->barlineSpan[cidx]);
@ -1047,7 +1047,11 @@ void Staff::init(const Staff* s)
{
_staffTypeList = s->_staffTypeList;
setDefaultClefType(s->defaultClefType());
_brackets = s->_brackets;
for (BracketItem* i : s->_brackets){
BracketItem* ni = new BracketItem(*i);
ni->setScore(score());
_brackets.push_back(ni);
}
_barLineSpan = s->_barLineSpan;
_barLineFrom = s->_barLineFrom;
_barLineTo = s->_barLineTo;

24
mscore/file.cpp
View file

@ -496,23 +496,19 @@ MasterScore* MuseScore::getNewFile()
if (pickupMeasure)
measures += 1;
MasterScore* score;
QString tp = newWizard->templatePath();
MasterScore* score = new MasterScore(MScore::defaultStyle());
QString tp = newWizard->templatePath();
QList<Excerpt*> excerpts;
if (!newWizard->emptyScore()) {
MasterScore* tscore = new MasterScore();
tscore->setMovements(new Movements());
tscore->setStyle(MScore::defaultStyle());
MasterScore* tscore = new MasterScore(MScore::defaultStyle());
Score::FileError rv = Ms::readScore(tscore, tp, false);
if (rv != Score::FileError::FILE_NO_ERROR) {
readScoreError(newWizard->templatePath(), rv, false);
delete tscore;
delete score;
return 0;
}
score = new MasterScore();
score->setMovements(new Movements());
score->setStyle(tscore->style());
// create instruments from template
for (Part* tpart : tscore->parts()) {
Part* part = new Part(score);
@ -545,8 +541,8 @@ MasterScore* MuseScore::getNewFile()
excerpts.append(x);
}
MeasureBase* mb = tscore->first();
if (mb && mb->type() == ElementType::VBOX) {
VBox* tvb = static_cast<VBox*>(mb);
if (mb && mb->isVBox()) {
VBox* tvb = toVBox(mb);
nvb = new VBox(score);
nvb->setBoxHeight(tvb->boxHeight());
nvb->setBoxWidth(tvb->boxWidth());
@ -560,13 +556,11 @@ MasterScore* MuseScore::getNewFile()
delete tscore;
}
else {
score = new MasterScore();
score->setMovements(new Movements());
score->setStyle(MScore::defaultStyle());
score = new MasterScore(MScore::defaultStyle());
newWizard->createInstruments(score);
}
score->setCreated(true);
score->masterScore()->fileInfo()->setFile(createDefaultName());
score->fileInfo()->setFile(createDefaultName());
if (!score->style().chordList()->loaded()) {
if (score->styleB(StyleIdx::chordsXmlFile))
@ -574,7 +568,7 @@ MasterScore* MuseScore::getNewFile()
score->style().chordList()->read(score->styleSt(StyleIdx::chordDescriptionFile));
}
if (!newWizard->title().isEmpty())
score->masterScore()->fileInfo()->setFile(newWizard->title());
score->fileInfo()->setFile(newWizard->title());
score->sigmap()->add(0, timesig);