diff options
| author | bunnei <bunneidev@gmail.com> | 2018-12-03 17:02:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-03 17:02:40 -0500 |
| commit | a238cdb5ca0805c8b89d952ca05e9b896571e845 (patch) | |
| tree | 761b39d410f02ae5185da2f89e375e52d2854178 /src | |
| parent | 1ad158b2bbc45f1f48c08ba9936696f7f7c97d1a (diff) | |
| parent | a9223c81820701971017e672fbb9ca065e560f7c (diff) | |
Merge pull request #1841 from ogniK5377/npad-mode-fix
Fixed crash with SetNpadMode
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 22e87a50a..b49e34594 100644 --- a/src/core/hle/service/hid/controllers/npad.cpp +++ b/src/core/hle/service/hid/controllers/npad.cpp @@ -518,8 +518,9 @@ Controller_NPad::NpadHoldType Controller_NPad::GetHoldType() const { } void Controller_NPad::SetNpadMode(u32 npad_id, NPadAssignments assignment_mode) { - ASSERT(npad_id < shared_memory_entries.size()); - shared_memory_entries[npad_id].pad_assignment = assignment_mode; + const std::size_t npad_index = NPadIdToIndex(npad_id); + ASSERT(npad_index < shared_memory_entries.size()); + shared_memory_entries[npad_index].pad_assignment = assignment_mode; } void Controller_NPad::VibrateController(const std::vector<u32>& controller_ids, |