liberodark/eden
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[hid_core] Fix a specific case where all controllers get disconnected by certain games (#2759)

Browse source 
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 <crueter@eden-emu.dev>
Co-authored-by: MaranBr <maranbr@outlook.com>
Co-committed-by: MaranBr <maranbr@outlook.com>
This commit is contained in:
MaranBr 2025-10-17 22:24:38 +02:00 • committed by crueter
parent de46b8e817
commit 9c7ed0f59d
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/hid_core/frontend/emulated_controller.cpp
View file

@ -924,10 +924,20 @@ void EmulatedController::SetButton(const Common::Input::CallbackStatus& callback
lock.unlock(); lock.unlock();
if (!is_connected && !controller_connected[player_index]) { if (!is_connected) {
if (player.connected) { if (npad_type == NpadStyleIndex::Handheld) {
Connect(); if (npad_id_type == NpadIdType::Handheld) {
controller_connected[player_index] = true; 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;
}
} }
} }

2
src/hid_core/frontend/emulated_controller.h
View file

@ -589,7 +589,7 @@ private:
std::array<VibrationValue, 2> last_vibration_value{DEFAULT_VIBRATION_VALUE, std::array<VibrationValue, 2> last_vibration_value{DEFAULT_VIBRATION_VALUE,
DEFAULT_VIBRATION_VALUE}; DEFAULT_VIBRATION_VALUE};
std::array<std::chrono::steady_clock::time_point, 2> last_vibration_timepoint{}; std::array<std::chrono::steady_clock::time_point, 2> last_vibration_timepoint{};
std::array<bool, HIDCore::available_controllers - 2> controller_connected{}; std::array<bool, HIDCore::available_controllers> controller_connected{};
// Temporary values to avoid doing changes while the controller is in configuring mode // Temporary values to avoid doing changes while the controller is in configuring mode
NpadStyleIndex tmp_npad_type{NpadStyleIndex::None}; NpadStyleIndex tmp_npad_type{NpadStyleIndex::None};