CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #10003 from german77/disconnect 

service: hid: Silence warning on MergeSingleJoyAsDualJoy
merge-requests/60/head
liamwhite 2023-03-28 09:09:47 +07:00 committed by GitHub
parent 40efd2ab56 c2c7386dfd
commit 9c96d40586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/hle/service/hid/controllers/npad.cpp
Unescape Escape View File

@ -1388,7 +1388,8 @@ Result Controller_NPad::MergeSingleJoyAsDualJoy(Core::HID::NpadIdType npad_id_1,
return NpadIsDualJoycon; return NpadIsDualJoycon;
} }
// Disconnect the joycon at the second id and connect the dual joycon at the first index. // Disconnect the joycons and connect them as dual joycon at the first index.
DisconnectNpad(npad_id_1);
DisconnectNpad(npad_id_2); DisconnectNpad(npad_id_2);
controller_1.is_dual_left_connected = true; controller_1.is_dual_left_connected = true;
controller_1.is_dual_right_connected = true; controller_1.is_dual_right_connected = true;