diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-03-28 09:09:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-28 09:09:47 -0400 |
| commit | 9c96d40586d89fd39b1bc80455542a1e54d10dee (patch) | |
| tree | 61d5c43bf9291151500e9954d3b6a7996488bba9 /src | |
| parent | 40efd2ab56c2296da4524085a133021f7731e67f (diff) | |
| parent | c2c7386dfd2041f9e8c5653cf6016d6b77afe124 (diff) | |
Merge pull request #10003 from german77/disconnect
service: hid: Silence warning on MergeSingleJoyAsDualJoy
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index ba6f04d8d3..21bd7b0c52 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -1388,7 +1388,8 @@ Result Controller_NPad::MergeSingleJoyAsDualJoy(Core::HID::NpadIdType npad_id_1, 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); controller_1.is_dual_left_connected = true; controller_1.is_dual_right_connected = true; |