diff options
| author |  LC | 2021-01-17 23:51:30 -0500 |
|---|---|---|
| committer |  GitHub | 2021-01-17 23:51:30 -0500 |
| commit | dd0679d710e6344105f91d24463ba0983dc22def (patch) | |
| tree | f87dfaef4b59b7051ca19367fb8eef8cf3bf2707 /src | |
| parent | Merge pull request #5360 from ReinUsesLisp/enforce-memclass-access (diff) | |
| parent | npad: Add check for HANDHELD_INDEX in UpdateControllerAt() (diff) | |
| download | yuzu-dd0679d710e6344105f91d24463ba0983dc22def.tar.gz yuzu-dd0679d710e6344105f91d24463ba0983dc22def.tar.xz yuzu-dd0679d710e6344105f91d24463ba0983dc22def.zip | |
Merge pull request #5757 from Morph1984/npad-handheld
npad: Add check for HANDHELD_INDEX in UpdateControllerAt()
Diffstat (limited to 'src')
| -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 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 | |||
| 892 | return; | 892 | return; |
| 893 | } | 893 | } |
| 894 | 894 | ||
| 895 | if (controller == NPadControllerType::Handheld) { | 895 | if (controller == NPadControllerType::Handheld && npad_index == HANDHELD_INDEX) { |
| 896 | Settings::values.players.GetValue()[HANDHELD_INDEX].controller_type = | 896 | Settings::values.players.GetValue()[HANDHELD_INDEX].controller_type = |
| 897 | MapNPadToSettingsType(controller); | 897 | MapNPadToSettingsType(controller); |
| 898 | Settings::values.players.GetValue()[HANDHELD_INDEX].connected = true; | 898 | Settings::values.players.GetValue()[HANDHELD_INDEX].connected = true; |