Merge pull request #10003 from german77/disconnect

service: hid: Silence warning on MergeSingleJoyAsDualJoy
This commit is contained in:
liamwhite 2023-03-28 09:09:47 -04:00 committed by GitHub
commit 9c96d40586
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

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;