From 9c7ed0f59dd41ec0bbbfbc81678209ae60a36016 Mon Sep 17 00:00:00 2001 From: MaranBr Date: Fri, 17 Oct 2025 22:24:38 +0200 Subject: [hid_core] Fix a specific case where all controllers get disconnected by certain games (#2759) There's a bug in some games where all controllers get disconnected. This fixes those specific cases where controllers set to Handheld or Player 1 need to remain connected. Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/2759 Reviewed-by: crueter Co-authored-by: MaranBr Co-committed-by: MaranBr --- src/hid_core/frontend/emulated_controller.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/hid_core/frontend/emulated_controller.cpp') diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp index 37a892c37f..604414c470 100644 --- a/src/hid_core/frontend/emulated_controller.cpp +++ b/src/hid_core/frontend/emulated_controller.cpp @@ -924,10 +924,20 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback lock.unlock(); - if (!is_connected && !controller_connected[player_index]) { - if (player.connected) { - Connect(); - controller_connected[player_index] = true; + if (!is_connected) { + if (npad_type == NpadStyleIndex::Handheld) { + if (npad_id_type == NpadIdType::Handheld) { + Connect(); + controller_connected[player_index] = true; + } + } else if (npad_type != NpadStyleIndex::Handheld) { + if (npad_id_type == NpadIdType::Player1) { + Connect(); + controller_connected[player_index] = true; + } else if (player.connected && !controller_connected[player_index]) { + Connect(); + controller_connected[player_index] = true; + } } } -- cgit v1.2.3