diff options
| author |  liamwhite | 2023-03-28 09:09:47 -0400 |
|---|---|---|
| committer |  GitHub | 2023-03-28 09:09:47 -0400 |
| commit | 9c96d40586d89fd39b1bc80455542a1e54d10dee (patch) | |
| tree | 61d5c43bf9291151500e9954d3b6a7996488bba9 /src | |
| parent | Merge pull request #9982 from Morph1984/tpause (diff) | |
| parent | service: hid: Silence warning on MergeSingleJoyAsDualJoy (diff) | |
| download | yuzu-9c96d40586d89fd39b1bc80455542a1e54d10dee.tar.gz yuzu-9c96d40586d89fd39b1bc80455542a1e54d10dee.tar.xz yuzu-9c96d40586d89fd39b1bc80455542a1e54d10dee.zip | |
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 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; |