mirror of
https://github.com/wiiu-env/AutobootModule.git
synced 2024-11-16 16:29:14 +01:00
Limit number of VPADRead attempt to 100 to avoid softlocks even if they should be impossible
This commit is contained in:
parent
febecd917e
commit
e87da7a5d7
@ -95,9 +95,10 @@ uint32_t remapClassicButtons(uint32_t buttons) {
|
||||
}
|
||||
|
||||
InputUtils::InputData InputUtils::getControllerInput() {
|
||||
InputData inputData{};
|
||||
VPADStatus vpadStatus{};
|
||||
InputData inputData = {};
|
||||
VPADStatus vpadStatus = {};
|
||||
VPADReadError vpadError = VPAD_READ_UNINITIALIZED;
|
||||
int maxAttempts = 100;
|
||||
do {
|
||||
if (VPADRead(VPAD_CHAN_0, &vpadStatus, 1, &vpadError) > 0 && vpadError == VPAD_READ_SUCCESS) {
|
||||
inputData.trigger = vpadStatus.trigger;
|
||||
@ -106,9 +107,9 @@ InputUtils::InputData InputUtils::getControllerInput() {
|
||||
} else {
|
||||
OSSleepTicks(OSMillisecondsToTicks(1));
|
||||
}
|
||||
} while (vpadError == VPAD_READ_NO_SAMPLES);
|
||||
} while (--maxAttempts > 0 && vpadError == VPAD_READ_NO_SAMPLES);
|
||||
|
||||
KPADStatus kpadStatus{};
|
||||
KPADStatus kpadStatus = {};
|
||||
KPADError kpadError = KPAD_ERROR_UNINITIALIZED;
|
||||
for (int32_t i = 0; i < 4; i++) {
|
||||
if (KPADReadEx((KPADChan) i, &kpadStatus, 1, &kpadError) > 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user