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

fix #233436: Do not search grace notes in different staves when making a tie

Browse source
This commit is contained in:
Dmitri Ovodok 2018-10-11 15:12:52 +03:00
parent b3feb3a971
commit de5b76a632
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libmscore/utils.cpp
View file

@ -853,6 +853,11 @@ Note* searchTieNote(Note* note)
if (e == 0 || !e->isChord())
continue;
Chord* c = toChord(e);
const int staffIdx = c->staffIdx() + c->staffMove();
if (staffIdx != chord->staffIdx() + chord->staffMove()) {
// this check is needed as we are iterating over all staves to capture cross-staff chords
continue;
}
// if there are grace notes before, try to tie to first one
QVector<Chord*> gnb = c->graceNotesBefore();
if (!gnb.empty()) {
@ -861,9 +866,6 @@ Note* searchTieNote(Note* note)
if (gn2)
return gn2;
}
int staffIdx = c->staffIdx() + c->staffMove();
if (staffIdx != chord->staffIdx() + chord->staffMove()) // cannot happen?
continue;
for (Note* n : c->notes()) {
if (n->pitch() == note->pitch()) {
if (note2 == 0 || c->track() == chord->track())