fix #295842: fix a crash on launching MuseScore with -s option

Also disable "Show Mixer" action when no synthesizer is available
musescore · Oct 19, 2019 · 0adb25e · 0adb25e
1 parent 1828787
commit 0adb25e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/mscore/mixer.cpp b/mscore/mixer.cpp
@@ -482,8 +482,13 @@ void Mixer::notifyTrackSelected(MixerTrack* track)
 
 void MuseScore::showMixer(bool visible)
       {
-
       QAction* toggleMixerAction = getAction("toggle-mixer");
+
+      if (!synti) {
+            toggleMixerAction->setChecked(false);
+            return;
+            }
+
       if (mixer == 0) {
             mixer = new Mixer(this);
             mscore->stackUnder(mixer);

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -4219,7 +4219,7 @@ void MuseScore::changeState(ScoreState val)
                   a->setEnabled(cs && (cs->selection().state() != SelState::NONE || val == STATE_FOTO));
             else if (enable && (s->key() == "select-similar-range"))
                   a->setEnabled(cs && cs->selection().state() == SelState::RANGE);
-            else if (enable && (s->key() == "synth-control")) {
+            else if (enable && (s->key() == "synth-control" || s->key() == "toggle-mixer")) {
                   Driver* driver = seq ? seq->driver() : 0;
                   // a->setEnabled(driver && driver->getSynth());
                   if (MScore::debugMode)