From 38bfe62a7c33c11166daf768b3b80aaaeb49c55b Mon Sep 17 00:00:00 2001
From: EvilDragon <mario.kruselj@gmail.com>
Date: Mon, 23 Aug 2021 03:04:57 +0200
Subject: [PATCH] Fix incorrect painting of global FX bypasses (#4893)

* Fix incorrect painting of global FX bypasses

Closes #4892

Also fixes color of send 3/4 sliders in Dark skin.

* Small code review change

Co-authored-by: Paul Walker <paul@pwjw.com>
---
 resources/data/skins/dark-mode.surge-skin/skin.xml | 2 ++
 src/gui/widgets/EffectChooser.h                    | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/resources/data/skins/dark-mode.surge-skin/skin.xml b/resources/data/skins/dark-mode.surge-skin/skin.xml
index 8bb49ec436e..bdc818d6339 100644
--- a/resources/data/skins/dark-mode.surge-skin/skin.xml
+++ b/resources/data/skins/dark-mode.surge-skin/skin.xml
@@ -232,6 +232,8 @@
     <control ui_identifier="scene.width" class="def-hslider"/>
     <control ui_identifier="scene.send_fx_1" class="def-hslider"/>
     <control ui_identifier="scene.send_fx_2" class="def-hslider"/>
+    <control ui_identifier="scene.send_fx_3" class="def-hslider"/>
+    <control ui_identifier="scene.send_fx_4" class="def-hslider"/>
 
     <control ui_identifier="scene.portamento" class="def-hslider"/>
     <control ui_identifier="scene.pitch" class="def-hslider"/>
diff --git a/src/gui/widgets/EffectChooser.h b/src/gui/widgets/EffectChooser.h
index 47e99f8fa5c..145fcc37b40 100644
--- a/src/gui/widgets/EffectChooser.h
+++ b/src/gui/widgets/EffectChooser.h
@@ -102,11 +102,13 @@ struct EffectChooser : public juce::Component, public WidgetBaseMixin<EffectChoo
         case fxb_no_fx:
             return true;
         case fxb_no_sends:
-            if ((fxslot == 4) || (fxslot == 5))
+            if ((fxslot == fxslot_send1) || (fxslot == fxslot_send2) || (fxslot == fxslot_send3) ||
+                (fxslot == fxslot_send4))
                 return true;
             break;
         case fxb_scene_fx_only:
-            if (fxslot > 3)
+            if ((fxslot >= fxslot_send1 && fxslot <= fxslot_global2) ||
+                (fxslot >= fxslot_send3 && fxslot <= fxslot_global4))
                 return true;
             break;
         }