summaryrefslogtreecommitdiff
path: root/src/joystick/SDL_gamecontroller.c
diff options
context:
space:
mode:
authorSam Lantinga <slouken@libsdl.org>2021-02-02 11:53:31 -0800
committerSam Lantinga <slouken@libsdl.org>2021-02-02 11:53:31 -0800
commitf9747ed8501b1ef595114cf076f9d10123066301 (patch)
treeaf7a7460dbed5d477166b79095d6c9d93b94d651 /src/joystick/SDL_gamecontroller.c
parent7b5c7fc2659f7d20ddbe0d4117dd2cfce1ca619d (diff)
downloadsdl-f9747ed8501b1ef595114cf076f9d10123066301.tar.gz
Fixed detecting the paddles on the Xbox Elite Series 1 controller
Diffstat (limited to 'src/joystick/SDL_gamecontroller.c')
-rw-r--r--src/joystick/SDL_gamecontroller.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/joystick/SDL_gamecontroller.c b/src/joystick/SDL_gamecontroller.c
index bf06fa1a5..9849bcc98 100644
--- a/src/joystick/SDL_gamecontroller.c
+++ b/src/joystick/SDL_gamecontroller.c
@@ -585,11 +585,8 @@ static ControllerMapping_t *SDL_CreateMappingForHIDAPIController(SDL_JoystickGUI
if (SDL_IsJoystickXboxOneSeriesX(vendor, product)) {
/* XBox One Series X Controllers have a share button under the guide button */
SDL_strlcat(mapping_string, "misc1:b15,", sizeof(mapping_string));
- } else if (SDL_IsJoystickXboxOneElite(vendor, product) &&
- !SDL_IsJoystickXboxOneEliteSeries1(vendor, product)) {
- /* XBox One Elite Controllers have 4 back paddle buttons
- * The Series 1 controller has paddles but they can't be unmapped
- */
+ } else if (SDL_IsJoystickXboxOneElite(vendor, product)) {
+ /* XBox One Elite Controllers have 4 back paddle buttons */
SDL_strlcat(mapping_string, "paddle1:b15,paddle2:b17,paddle3:b16,paddle4:b18,", sizeof(mapping_string));
} else if (SDL_IsJoystickSteamController(vendor, product)) {
/* Steam controllers have 2 back paddle buttons */