Fix a bug in mapChannelToOctave mode where channel 3 was being sent t…

…o scene B when scene A was active (#4813)
surge-synthesizer · Aug 8, 2021 · 78be91c · 78be91c
1 parent 1aff5b8
commit 78be91c
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/common/SurgeSynthesizer.cpp b/src/common/SurgeSynthesizer.cpp
@@ -293,7 +293,7 @@ int SurgeSynthesizer::calculateChannelMask(int channel, int key)
     int channelmask = channel;
 
     if ((channel == 0) || (channel > 2) || mpeEnabled ||
-        storage.getPatch().scenemode.val.i == sm_chsplit)
+        storage.getPatch().scenemode.val.i == sm_chsplit || storage.mapChannelToOctave)
     {
         switch (storage.getPatch().scenemode.val.i)
         {
@@ -322,8 +322,7 @@ int SurgeSynthesizer::calculateChannelMask(int channel, int key)
             break;
         }
     }
-    else if (storage.getPatch().scenemode.val.i == sm_single &&
-             !storage.getPatch().dawExtraState.mapChannelToOctave)
+    else if (storage.getPatch().scenemode.val.i == sm_single)
     {
         if (storage.getPatch().scene_active.val.i == 1)
             channelmask = 2;