diff options
| author |  Narr the Reg | 2023-03-27 13:24:56 -0600 |
|---|---|---|
| committer | Narr the Reg | 2023-03-27 13:25:15 -0600 |
| commit | c2c7386dfd2041f9e8c5653cf6016d6b77afe124 (patch) | |
| tree | 891e5e5d9b9974f740872bf27563a7eb2b422fa9 | |
| parent | Merge pull request #9992 from liamwhite/climits (diff) | |
| download | yuzu-c2c7386dfd2041f9e8c5653cf6016d6b77afe124.tar.gz yuzu-c2c7386dfd2041f9e8c5653cf6016d6b77afe124.tar.xz yuzu-c2c7386dfd2041f9e8c5653cf6016d6b77afe124.zip | |
service: hid: Silence warning on MergeSingleJoyAsDualJoy
Diffstat (limited to '')
| -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, | |||
| 1388 | return NpadIsDualJoycon; | 1388 | return NpadIsDualJoycon; |
| 1389 | } | 1389 | } |
| 1390 | 1390 | ||
| 1391 | // Disconnect the joycon at the second id and connect the dual joycon at the first index. | 1391 | // Disconnect the joycons and connect them as dual joycon at the first index. |
| 1392 | DisconnectNpad(npad_id_1); | ||
| 1392 | DisconnectNpad(npad_id_2); | 1393 | DisconnectNpad(npad_id_2); |
| 1393 | controller_1.is_dual_left_connected = true; | 1394 | controller_1.is_dual_left_connected = true; |
| 1394 | controller_1.is_dual_right_connected = true; | 1395 | controller_1.is_dual_right_connected = true; |