Manual merge pull request #3792 from handrok/Saving-synth-settings-in…

…-two-scores from master fix #274026: Unable to save synth settings in two scores in the same session
musescore · Jul 17, 2018 · 15ebb47 · 15ebb47
1 parent 4e4cfce
commit 15ebb47
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/mscore/synthcontrol.cpp b/mscore/synthcontrol.cpp
@@ -221,6 +221,16 @@ void SynthControl::setMeter(float l, float r, float left_peak, float right_peak)
       gain->setMeterVal(1, r, right_peak);
       }
 
+//---------------------------------------------------------
+//   setScore
+//---------------------------------------------------------
+void SynthControl::setScore(Score* s) {
+      _score = s;
+
+      loadButton->setEnabled(true);
+      saveButton->setEnabled(true);
+      }
+
 //---------------------------------------------------------
 //   stop
 //---------------------------------------------------------

diff --git a/mscore/synthcontrol.h b/mscore/synthcontrol.h
@@ -70,7 +70,7 @@ class SynthControl : public QWidget, Ui::SynthControl {
       SynthControl(QWidget* parent);
       void setMeter(float, float, float, float);
       void stop();
-      void setScore(Score* s) { _score = s; }
+      void setScore(Score* s);
       void writeSettings();
       void updateGui();
       };