From 6e53a364141d6f5e95bfd805982a9b137bd5463d Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Thu, 20 Jun 2024 14:37:30 -0700 Subject: [PATCH] Fixed Y + right shoulder button combination on third party Switch controllers --- src/joystick/hidapi/SDL_hidapi_switch.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/joystick/hidapi/SDL_hidapi_switch.c b/src/joystick/hidapi/SDL_hidapi_switch.c index a9da7a74d5dfc..8eacba6329f5c 100644 --- a/src/joystick/hidapi/SDL_hidapi_switch.c +++ b/src/joystick/hidapi/SDL_hidapi_switch.c @@ -2562,13 +2562,13 @@ static SDL_bool HIDAPI_DriverSwitch_UpdateDevice(SDL_HIDAPI_Device *device) continue; } - if (ctx->m_rgucReadBuffer[0] == k_eSwitchInputReportIDs_SubcommandReply) { - continue; - } - if (ctx->m_bInputOnly) { HandleInputOnlyControllerState(joystick, ctx, (SwitchInputOnlyControllerStatePacket_t *)&ctx->m_rgucReadBuffer[0]); } else { + if (ctx->m_rgucReadBuffer[0] == k_eSwitchInputReportIDs_SubcommandReply) { + continue; + } + ctx->m_nCurrentInputMode = ctx->m_rgucReadBuffer[0]; switch (ctx->m_rgucReadBuffer[0]) {