diff options
author | LC <mathew1800@gmail.com> | 2021-01-17 23:51:30 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-17 23:51:30 -0500 |
commit | dd0679d710e6344105f91d24463ba0983dc22def (patch) | |
tree | f87dfaef4b59b7051ca19367fb8eef8cf3bf2707 | |
parent | e8401964b4cb617223554e147091f109dc870ba5 (diff) | |
parent | 4a67a5b917d1cb3990bcd46f1f26fcade4efe471 (diff) |
Merge pull request #5757 from Morph1984/npad-handheld
npad: Add check for HANDHELD_INDEX in UpdateControllerAt()
-rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 2 |
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 1082be4898..ff783b3cca 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; |