From 684c95c7e8722a97520dd530bd668e75417e2c12 Mon Sep 17 00:00:00 2001
From: TuxSH <1922548+TuxSH@users.noreply.github.com>
Date: Tue, 1 Oct 2024 23:31:22 +0200
Subject: [PATCH] rosalina: in volume override menu, add support for CPAD too

---
 sysmodules/rosalina/source/menus/sysconfig.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/sysmodules/rosalina/source/menus/sysconfig.c b/sysmodules/rosalina/source/menus/sysconfig.c
index 64244a511..fdb1b0798 100644
--- a/sysmodules/rosalina/source/menus/sysconfig.c
+++ b/sysmodules/rosalina/source/menus/sysconfig.c
@@ -437,7 +437,7 @@ void SysConfigMenu_AdjustVolume(void)
     {
         Draw_Lock();
         Draw_DrawString(10, 10, COLOR_TITLE, "System configuration menu");
-        u32 posY = Draw_DrawString(10, 30, COLOR_WHITE, "Y: Toggle volume slider override.\nDPAD: Adjust the volume level.\nA: Apply\nB: Go back\n\n");
+        u32 posY = Draw_DrawString(10, 30, COLOR_WHITE, "Y: Toggle volume slider override.\nDPAD/CPAD: Adjust the volume level.\nA: Apply\nB: Go back\n\n");
         Draw_DrawString(10, posY, COLOR_WHITE, "Current status:");
         posY = Draw_DrawString(100, posY, (tempVolumeOverride == -1) ? COLOR_RED : COLOR_GREEN, (tempVolumeOverride == -1) ? " DISABLED" : " ENABLED ");
         if (tempVolumeOverride != -1) {
@@ -447,8 +447,12 @@ void SysConfigMenu_AdjustVolume(void)
         }
 
         Draw_FlushFramebuffer();
+        Draw_Unlock();
+
         u32 pressed = waitInputWithTimeout(1000);
 
+        Draw_Lock();
+
         if(pressed & KEY_A)
         {
             currVolumeSliderOverride = tempVolumeOverride;
@@ -471,16 +475,16 @@ void SysConfigMenu_AdjustVolume(void)
                 tempVolumeOverride = -1;
             }
         }
-        else if ((pressed & (KEY_DUP | KEY_DDOWN | KEY_DLEFT | KEY_DRIGHT)) && tempVolumeOverride != -1)
+        else if ((pressed & (KEY_UP | KEY_DOWN | KEY_LEFT | KEY_RIGHT)) && tempVolumeOverride != -1)
         {
             Draw_DrawString(10, posY, COLOR_WHITE, "\n                 ");
-            if (pressed & KEY_DUP)
+            if (pressed & KEY_UP)
                 tempVolumeOverride++;
-            else if (pressed & KEY_DDOWN)
+            else if (pressed & KEY_DOWN)
                 tempVolumeOverride--;
-            else if (pressed & KEY_DRIGHT)
+            else if (pressed & KEY_RIGHT)
                 tempVolumeOverride+=10;
-            else if (pressed & KEY_DLEFT)
+            else if (pressed & KEY_LEFT)
                 tempVolumeOverride-=10;
 
             if (tempVolumeOverride < 0)
@@ -488,6 +492,9 @@ void SysConfigMenu_AdjustVolume(void)
             if (tempVolumeOverride > 100)
                 tempVolumeOverride = 100;
         }
+
+        Draw_FlushFramebuffer();
+        Draw_Unlock();
     } while(!menuShouldExit);
 }