Skip to content

Commit

Permalink
fix #27811
Browse files Browse the repository at this point in the history
  • Loading branch information
wschweer committed Jul 18, 2014
1 parent 70e1b46 commit 5158978
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions libmscore/note.cpp
Expand Up @@ -1059,10 +1059,15 @@ void Note::read(XmlReader& e)
// ensure sane values:
_pitch = limit(_pitch, 0, 127);

if (score()->mscVersion() < 117 && !concertPitch()) {
_pitch += transposition();
_tpc[1] = _tpc[0];
_tpc[0] = Tpc::TPC_INVALID;
if (score()->mscVersion() < 117) {
if (concertPitch()) {
_tpc[1] = Tpc::TPC_INVALID;
}
else {
_pitch += transposition();
_tpc[1] = _tpc[0];
_tpc[0] = Tpc::TPC_INVALID;
}
}
if (!tpcIsValid(_tpc[0]) && !tpcIsValid(_tpc[1])) {
Key key = (staff() && chord()) ? staff()->key(chord()->tick()) : Key::C;
Expand Down Expand Up @@ -1441,7 +1446,7 @@ Element* Note::drop(const DropData& data)
//---------------------------------------------------------
// addBracket
//---------------------------------------------------------

void Note::addBracket()
{
Symbol* s = new Symbol(score());
Expand All @@ -1453,7 +1458,7 @@ void Note::addBracket()
s->setParent(this);
score()->undoAddElement(s);
}

//---------------------------------------------------------
// setDotPosition
//---------------------------------------------------------
Expand Down

0 comments on commit 5158978

Please sign in to comment.