Skip to content

Commit

Permalink
fix regression for score creation
Browse files Browse the repository at this point in the history
  • Loading branch information
wschweer committed Mar 3, 2015
1 parent 75bd3ba commit 7d2e05d
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions mscore/file.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -572,25 +572,25 @@ void MuseScore::newFile()
Measure* m = _score->firstMeasure();
Segment* s = m->getSegment(ts, 0);
s->add(ts);
}
Part* part = staff->part();
if (!part->instr()->useDrumset()) {
//
// transpose key
//
KeySigEvent nKey = ks;
if (!nKey.custom() && part->instr()->transpose().chromatic && !score->styleB(StyleIdx::concertPitch)) {
int diff = -part->instr()->transpose().chromatic;
nKey.setKey(transposeKey(nKey.key(), diff));
}
// do not create empty, invisible keysig
if (nKey.custom() || nKey.key() != Key::C) {
staff->setKey(0, nKey);
KeySig* keysig = new KeySig(score);
keysig->setTrack(staffIdx * VOICES);
keysig->setKeySigEvent(nKey);
Segment* s = measure->getSegment(keysig, 0);
s->add(keysig);
Part* part = staff->part();
if (!part->instr()->useDrumset()) {
//
// transpose key
//
KeySigEvent nKey = ks;
if (!nKey.custom() && part->instr()->transpose().chromatic && !score->styleB(StyleIdx::concertPitch)) {
int diff = -part->instr()->transpose().chromatic;
nKey.setKey(transposeKey(nKey.key(), diff));
}
// do not create empty, invisible keysig
if (nKey.custom() || nKey.key() != Key::C) {
staff->setKey(0, nKey);
KeySig* keysig = new KeySig(score);
keysig->setTrack(staffIdx * VOICES);
keysig->setKeySigEvent(nKey);
Segment* s = measure->getSegment(keysig, 0);
s->add(keysig);
}
}
}
if (measure->timesig() != measure->len()) {
Expand Down

0 comments on commit 7d2e05d

Please sign in to comment.