mirror of
https://github.com/citra-emu/citra.git
synced 2024-11-23 23:50:10 +00:00
fix ASAN error in sdl_impl.cpp (#7427)
This commit is contained in:
parent
0c40c10022
commit
3c9157b1ec
@ -429,18 +429,20 @@ Common::ParamPackage SDLState::GetSDLControllerButtonBindByGUID(
|
||||
|
||||
#if SDL_VERSION_ATLEAST(2, 0, 6)
|
||||
{
|
||||
const SDL_ExtendedGameControllerBind extended_bind =
|
||||
controller->bindings[mapped_button];
|
||||
if (extended_bind.input.axis.axis_max < extended_bind.input.axis.axis_min) {
|
||||
params.Set("direction", "-");
|
||||
} else {
|
||||
params.Set("direction", "+");
|
||||
if (mapped_button != SDL_CONTROLLER_BUTTON_INVALID) {
|
||||
const SDL_ExtendedGameControllerBind extended_bind =
|
||||
controller->bindings[mapped_button];
|
||||
if (extended_bind.input.axis.axis_max < extended_bind.input.axis.axis_min) {
|
||||
params.Set("direction", "-");
|
||||
} else {
|
||||
params.Set("direction", "+");
|
||||
}
|
||||
params.Set("threshold", (extended_bind.input.axis.axis_min +
|
||||
(extended_bind.input.axis.axis_max -
|
||||
extended_bind.input.axis.axis_min) /
|
||||
2.0f) /
|
||||
SDL_JOYSTICK_AXIS_MAX);
|
||||
}
|
||||
params.Set(
|
||||
"threshold",
|
||||
(extended_bind.input.axis.axis_min +
|
||||
(extended_bind.input.axis.axis_max - extended_bind.input.axis.axis_min) / 2.0f) /
|
||||
SDL_JOYSTICK_AXIS_MAX);
|
||||
}
|
||||
#else
|
||||
params.Set("direction", "+"); // lacks extended_bind, so just a guess
|
||||
|
Loading…
Reference in New Issue
Block a user