From: Toni Wilen <twilen@winuae.net>
Date: Sat, 21 Jan 2023 10:50:29 +0000 (+0200)
Subject: Fix "default" button setting not fully enabling CD32 pad mode when CD32 was configured.
X-Git-Tag: 41010~3
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=77feccd620f741e8b31923f0e3920988f02b5fe6;p=francis%2Fwinuae.git

Fix "default" button setting not fully enabling CD32 pad mode when CD32 was configured.
---

diff --git a/inputdevice.cpp b/inputdevice.cpp
index 549b0295..191673e4 100644
--- a/inputdevice.cpp
+++ b/inputdevice.cpp
@@ -7233,7 +7233,8 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
 				default:
 				{
 					bool iscd32 = mode == JSEM_MODE_JOYSTICK_CD32 || (mode == JSEM_MODE_DEFAULT && prefs->cs_cd32cd);
-					input_get_default_joystick (joysticks, joy, i, af, mode, !gameports, false);
+					int jmode = iscd32 ? JSEM_MODE_JOYSTICK_CD32 : mode;
+					input_get_default_joystick(joysticks, joy, i, af, jmode, !gameports, false);
 					if (iscd32)
 						joymodes[i] = JSEM_MODE_JOYSTICK_CD32;
 					else if (mode == JSEM_MODE_GAMEPAD)
@@ -7243,21 +7244,21 @@ static void compatibility_copy (struct uae_prefs *prefs, bool gameports)
 					break;
 				}
 				case JSEM_MODE_JOYSTICK_ANALOG:
-					input_get_default_joystick_analog (joysticks, joy, i, af, !gameports, false);
+					input_get_default_joystick_analog(joysticks, joy, i, af, !gameports, false);
 					joymodes[i] = JSEM_MODE_JOYSTICK_ANALOG;
 					break;
 				case JSEM_MODE_MOUSE:
 				case JSEM_MODE_WHEELMOUSE:
-					input_get_default_mouse (joysticks, joy, i, af, !gameports, mode == JSEM_MODE_WHEELMOUSE, true);
+					input_get_default_mouse(joysticks, joy, i, af, !gameports, mode == JSEM_MODE_WHEELMOUSE, true);
 					joymodes[i] = JSEM_MODE_WHEELMOUSE;
 					break;
 				case JSEM_MODE_LIGHTPEN:
-					input_get_default_lightpen (joysticks, joy, i, af, !gameports, true, submode);
+					input_get_default_lightpen(joysticks, joy, i, af, !gameports, true, submode);
 					joymodes[i] = JSEM_MODE_LIGHTPEN;
 					break;
 				case JSEM_MODE_MOUSE_CDTV:
 					joymodes[i] = JSEM_MODE_MOUSE_CDTV;
-					input_get_default_joystick (joysticks, joy, i, af, mode, !gameports, false);
+					input_get_default_joystick(joysticks, joy, i, af, mode, !gameports, false);
 					break;
 
 				}