diff options
| author | Narr the Reg <juangerman-13@hotmail.com> | 2023-03-27 21:24:56 +0200 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2023-03-27 21:25:15 +0200 |
| commit | c2c7386dfd2041f9e8c5653cf6016d6b77afe124 (patch) | |
| tree | 891e5e5d9b9974f740872bf27563a7eb2b422fa9 /src/core | |
| parent | Merge pull request #9992 from liamwhite/climits (diff) | |
| download | yuzu-c2c7386dfd2041f9e8c5653cf6016d6b77afe124.tar yuzu-c2c7386dfd2041f9e8c5653cf6016d6b77afe124.tar.gz yuzu-c2c7386dfd2041f9e8c5653cf6016d6b77afe124.tar.bz2 yuzu-c2c7386dfd2041f9e8c5653cf6016d6b77afe124.tar.lz yuzu-c2c7386dfd2041f9e8c5653cf6016d6b77afe124.tar.xz yuzu-c2c7386dfd2041f9e8c5653cf6016d6b77afe124.tar.zst yuzu-c2c7386dfd2041f9e8c5653cf6016d6b77afe124.zip | |
Diffstat (limited to 'src/core')
| -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 ba6f04d8d..21bd7b0c5 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; |