yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

addressed issues

This commit is contained in:
David Marcec 2019-07-08 14:51:40 +10:00
parent 472210bf72
commit 5234e08a0d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -563,17 +563,18 @@ bool Controller_NPad::SwapNpadAssignment(u32 npad_id_1, u32 npad_id_2) {
npad_id_2 == NPAD_UNKNOWN) { npad_id_2 == NPAD_UNKNOWN) {
return true; return true;
} }
const auto npad_index_1 = NPadIdToIndex(npad_id_1);
const auto npad_index_2 = NPadIdToIndex(npad_id_2);
if (!IsControllerSupported(connected_controllers[NPadIdToIndex(npad_id_1)].type) || if (!IsControllerSupported(connected_controllers[npad_index_1].type) ||
!IsControllerSupported(connected_controllers[NPadIdToIndex(npad_id_2)].type)) { !IsControllerSupported(connected_controllers[npad_index_2].type)) {
return false; return false;
} }
std::swap(connected_controllers[NPadIdToIndex(npad_id_1)].type, std::swap(connected_controllers[npad_index_1].type, connected_controllers[npad_index_2].type);
connected_controllers[NPadIdToIndex(npad_id_2)].type);
InitNewlyAddedControler(NPadIdToIndex(npad_id_1)); InitNewlyAddedControler(npad_index_1);
InitNewlyAddedControler(NPadIdToIndex(npad_id_2)); InitNewlyAddedControler(npad_index_2);
return true; return true;
} }