purgatory/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1841 from ogniK5377/npad-mode-fix

Browse Source 
Fixed crash with SetNpadMode
This commit is contained in:
bunnei 2018-12-03 17:02:40 -05:00 committed by GitHub
commit a238cdb5ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/hle/service/hid/controllers/npad.cpp
View File

@ -518,8 +518,9 @@ Controller_NPad::NpadHoldType Controller_NPad::GetHoldType() const {
} }
void Controller_NPad::SetNpadMode(u32 npad_id, NPadAssignments assignment_mode) { void Controller_NPad::SetNpadMode(u32 npad_id, NPadAssignments assignment_mode) {
ASSERT(npad_id < shared_memory_entries.size()); const std::size_t npad_index = NPadIdToIndex(npad_id);
shared_memory_entries[npad_id].pad_assignment = assignment_mode; 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, void Controller_NPad::VibrateController(const std::vector<u32>& controller_ids,