fix #119136: instrument doesn't switch back after midiAction. See PR #…

…2750
musescore · Aug 11, 2016 · 99dde41 · 99dde41
1 parent 56a90d0
commit 99dde41
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/mscore/seq.cpp b/mscore/seq.cpp
@@ -689,12 +689,10 @@ void Seq::process(unsigned n, float* buffer)
                               _driver->startTransport();
                               }
                         }
-                  if (preferences.useJackMidi) { // TODO same for ALSA Midi
-                        // Initializing instruments every time we start playback.
-                        // External synth can have wrong values, for example
-                        // if we switch between scores
-                        initInstruments(true);
-                        }
+                  // Initializing instruments every time we start playback.
+                  // External synth can have wrong values, for example
+                  // if we switch between scores
+                  initInstruments(true);
                   // Need to change state after calling collectEvents()
                   state = Transport::PLAY;
                   if (mscore->countIn() && cs->playMode() == PlayMode::SYNTHESIZER) {
@@ -708,6 +706,7 @@ void Seq::process(unsigned n, float* buffer)
                   state = Transport::STOP;
                   // Muting all notes
                   stopNotes(-1, true);
+                  initInstruments(true);
                   if (playPos == events.cend()) {
                         if (mscore->loop()) {
                               qDebug("Seq.cpp - Process - Loop whole score. playPos = %d     cs->pos() = %d", playPos->first,cs->pos());