From af933c086af0a7fbc903defc2c40a94b1f8648a8 Mon Sep 17 00:00:00 2001 From: NepDisk Date: Thu, 12 Feb 2026 23:17:00 -0500 Subject: [PATCH] remove duped gamepad init from merge --- src/sdl/i_system.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/sdl/i_system.cpp b/src/sdl/i_system.cpp index a73f7fdbc..316146daa 100644 --- a/src/sdl/i_system.cpp +++ b/src/sdl/i_system.cpp @@ -1326,6 +1326,7 @@ void I_InitJoystick(UINT8 index) return; } } + if (SDL_WasInit(SDL_INIT_GAMEPAD) == 0) { if (!SDL_InitSubSystem(SDL_INIT_GAMEPAD)) @@ -1335,16 +1336,6 @@ void I_InitJoystick(UINT8 index) } } - - // if (SDL_WasInit(SDL_INIT_GAMEPAD) == 0) - // { - // if (!SDL_InitSubSystem(SDL_INIT_GAMEPAD)) - // { - // CONS_Printf(M_GetText("Couldn't initialize gamepads: %s\n"), SDL_GetError()); - // return; - // } - // } - joystick_list = SDL_GetJoysticks(&num_joy); if (joystick_list && cv_usejoystick[index].value > 0 && cv_usejoystick[index].value <= num_joy)