citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

fix ASAN error in sdl_impl.cpp (#7427)

This commit is contained in:
oltolm 2024-02-09 23:08:15 +01:00 committed by GitHub
parent 0c40c10022
commit 3c9157b1ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/input_common/sdl/sdl_impl.cpp
View File

@ -429,6 +429,7 @@ Common::ParamPackage SDLState::GetSDLControllerButtonBindByGUID(
#if SDL_VERSION_ATLEAST(2, 0, 6) #if SDL_VERSION_ATLEAST(2, 0, 6)
{ {
if (mapped_button != SDL_CONTROLLER_BUTTON_INVALID) {
const SDL_ExtendedGameControllerBind extended_bind = const SDL_ExtendedGameControllerBind extended_bind =
controller->bindings[mapped_button]; controller->bindings[mapped_button];
if (extended_bind.input.axis.axis_max < extended_bind.input.axis.axis_min) { if (extended_bind.input.axis.axis_max < extended_bind.input.axis.axis_min) {
@ -436,12 +437,13 @@ Common::ParamPackage SDLState::GetSDLControllerButtonBindByGUID(
} else { } else {
params.Set("direction", "+"); params.Set("direction", "+");
} }
params.Set( params.Set("threshold", (extended_bind.input.axis.axis_min +
"threshold", (extended_bind.input.axis.axis_max -
(extended_bind.input.axis.axis_min + extended_bind.input.axis.axis_min) /
(extended_bind.input.axis.axis_max - extended_bind.input.axis.axis_min) / 2.0f) / 2.0f) /
SDL_JOYSTICK_AXIS_MAX); SDL_JOYSTICK_AXIS_MAX);
} }
}
#else #else
params.Set("direction", "+"); // lacks extended_bind, so just a guess params.Set("direction", "+"); // lacks extended_bind, so just a guess
#endif #endif