eden-emu/SDL
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed crash when the joystick can't be opened

Browse source
This commit is contained in:
Sam Lantinga 2023-07-17 17:35:38 -07:00
parent 2ebbfe7c5b
commit eb8b5ed3a4
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
test/testcontroller.c
View file

@ -295,16 +295,25 @@ static int StandardizeAxisValue(int nValue)
static void RefreshControllerName(void) static void RefreshControllerName(void)
{ {
const char *name = NULL;
SDL_free(controller_name); SDL_free(controller_name);
controller_name = NULL; controller_name = NULL;
if (controller) { if (controller) {
if (controller->gamepad) { if (controller->gamepad) {
controller_name = SDL_strdup(SDL_GetGamepadName(controller->gamepad)); name = SDL_GetGamepadName(controller->gamepad);
} else { } else {
controller_name = SDL_strdup(SDL_GetJoystickName(controller->joystick)); name = SDL_GetJoystickName(controller->joystick);
} }
} }
SDL_free(controller_name);
if (name) {
controller_name = SDL_strdup(name);
} else {
controller_name = SDL_strdup("");
}
} }
static void SetAndFreeGamepadMapping(char *mapping) static void SetAndFreeGamepadMapping(char *mapping)