From 515c22f50db79e1e26912d4c3944d43e1b3c4225 Mon Sep 17 00:00:00 2001 From: NSDeathman Date: Mon, 9 Mar 2026 18:40:13 +0300 Subject: [PATCH] Fix gamepad hot-plug detection --- .../Windows64/Windows64_Minecraft.cpp | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp index 70aeb22bf..3ab47affc 100644 --- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp +++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp @@ -1806,23 +1806,16 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance, InputManager.Tick(); // Detect KBM vs controller input mode - if (InputManager.IsPadConnected(0)) - { - const bool controllerUsed = InputManager.ButtonPressed(0) || - InputManager.GetJoypadStick_LX(0, false) != 0.0f || - InputManager.GetJoypadStick_LY(0, false) != 0.0f || - InputManager.GetJoypadStick_RX(0, false) != 0.0f || - InputManager.GetJoypadStick_RY(0, false) != 0.0f; + const bool controllerUsed = InputManager.ButtonPressed(0) || + InputManager.GetJoypadStick_LX(0, false) != 0.0f || + InputManager.GetJoypadStick_LY(0, false) != 0.0f || + InputManager.GetJoypadStick_RX(0, false) != 0.0f || + InputManager.GetJoypadStick_RY(0, false) != 0.0f; - if (controllerUsed) - g_KBMInput.SetKBMActive(false); - else if (g_KBMInput.HasAnyInput()) - g_KBMInput.SetKBMActive(true); - } - else - { + if (controllerUsed) + g_KBMInput.SetKBMActive(false); + else if (g_KBMInput.HasAnyInput()) g_KBMInput.SetKBMActive(true); - } if (!g_KBMInput.IsMouseGrabbed()) {