summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-03-28 15:09:47 +0200
committerGitHub <noreply@github.com>2023-03-28 15:09:47 +0200
commit9c96d40586d89fd39b1bc80455542a1e54d10dee (patch)
tree61d5c43bf9291151500e9954d3b6a7996488bba9 /src
parentMerge pull request #9982 from Morph1984/tpause (diff)
parentservice: hid: Silence warning on MergeSingleJoyAsDualJoy (diff)
downloadyuzu-9c96d40586d89fd39b1bc80455542a1e54d10dee.tar
yuzu-9c96d40586d89fd39b1bc80455542a1e54d10dee.tar.gz
yuzu-9c96d40586d89fd39b1bc80455542a1e54d10dee.tar.bz2
yuzu-9c96d40586d89fd39b1bc80455542a1e54d10dee.tar.lz
yuzu-9c96d40586d89fd39b1bc80455542a1e54d10dee.tar.xz
yuzu-9c96d40586d89fd39b1bc80455542a1e54d10dee.tar.zst
yuzu-9c96d40586d89fd39b1bc80455542a1e54d10dee.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp3
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;