Skip to content

Commit

Permalink
fix #287701: Default synthesizer settings not applied to new or loade…
Browse files Browse the repository at this point in the history
…d score
  • Loading branch information
jthistle committed Apr 19, 2019
1 parent 935af55 commit 62b4559
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
1 change: 0 additions & 1 deletion libmscore/score.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4545,7 +4545,6 @@ void MasterScore::setLayout(const Fraction& t)
// the value of the expressive parameter.
//---------------------------------------------------------


void MasterScore::updateExpressive(MasterSynthesizer* m)
{
SynthesizerState s = synthesizerState();
Expand Down
8 changes: 8 additions & 0 deletions mscore/file.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,10 @@ MasterScore* MuseScore::getNewFile()
if (!copyright.isEmpty())
score->setMetaTag("copyright", copyright);

if (synti)
score->setSynthesizerState(synti->state());

// Call this even if synti doesn't exist - we need to rebuild either way
score->rebuildAndUpdateExpressive(synti);

{
Expand Down Expand Up @@ -2247,6 +2251,10 @@ Score::FileError readScore(MasterScore* score, QString name, bool ignoreVersionE
score->setName(info.completeBaseName());
score->setImportedFilePath(name);

// Set the default synthesizer state before we read
if (synti)
score->setSynthesizerState(synti->state());

if (suffix == "mscz" || suffix == "mscx") {
Score::FileError rv = score->loadMsc(name, ignoreVersionError);
if (score && score->masterScore()->fileInfo()->path().startsWith(":/"))
Expand Down

0 comments on commit 62b4559

Please sign in to comment.