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

fix #275592: Tempotext is not applied during playback 2.X->3.0

Browse source 
Add if statement before applying new tempo. Because tempo should be setted by the MasterScore.
This commit is contained in:
alexandr 2018-09-05 11:42:13 +02:00
parent 87db07ea92
commit 4459158d4b
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libmscore/layout.cpp
View file

@ -3406,7 +3406,8 @@ System* Score::collectSystem(LayoutContext& lc)
for (Element* e : s->annotations()) {
if (e->isTempoText()) {
TempoText* tt = toTempoText(e);
setTempo(tt->segment(), tt->tempo());
if (score()->isMaster())
setTempo(tt->segment(), tt->tempo());
tt->layout();
}
else if (e->isFermata()) {

3
libmscore/layoutlinear.cpp
View file

@ -346,7 +346,8 @@ void LayoutContext::layoutLinear()
for (Element* e : s->annotations()) {
if (e->isTempoText()) {
TempoText* tt = toTempoText(e);
score->setTempo(tt->segment(), tt->tempo());
if (score->isMaster())
score->setTempo(tt->segment(), tt->tempo());
tt->layout();
}
else if (e->isFermata())