summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2021-01-18 05:51:30 +0100
committerGitHub <noreply@github.com>2021-01-18 05:51:30 +0100
commitdd0679d710e6344105f91d24463ba0983dc22def (patch)
treef87dfaef4b59b7051ca19367fb8eef8cf3bf2707
parentMerge pull request #5360 from ReinUsesLisp/enforce-memclass-access (diff)
parentnpad: Add check for HANDHELD_INDEX in UpdateControllerAt() (diff)
downloadyuzu-dd0679d710e6344105f91d24463ba0983dc22def.tar
yuzu-dd0679d710e6344105f91d24463ba0983dc22def.tar.gz
yuzu-dd0679d710e6344105f91d24463ba0983dc22def.tar.bz2
yuzu-dd0679d710e6344105f91d24463ba0983dc22def.tar.lz
yuzu-dd0679d710e6344105f91d24463ba0983dc22def.tar.xz
yuzu-dd0679d710e6344105f91d24463ba0983dc22def.tar.zst
yuzu-dd0679d710e6344105f91d24463ba0983dc22def.zip
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index 1082be489..ff783b3cc 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -892,7 +892,7 @@ void Controller_NPad::UpdateControllerAt(NPadControllerType controller, std::siz
return;
}
- if (controller == NPadControllerType::Handheld) {
+ if (controller == NPadControllerType::Handheld && npad_index == HANDHELD_INDEX) {
Settings::values.players.GetValue()[HANDHELD_INDEX].controller_type =
MapNPadToSettingsType(controller);
Settings::values.players.GetValue()[HANDHELD_INDEX].connected = true;