vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Copy string from SDL_JoystickNameForIndex before the subsystem is shut down

This commit is contained in:
mazmazz 2018-12-03 05:37:07 -05:00
parent 0f11116e7b
commit 19d19543b7
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/sdl/i_system.c
View File

@ -1455,16 +1455,34 @@ INT32 I_NumJoys(void)
const char *I_GetJoyName(INT32 joyindex)
{
const char *joyname = "NA";
const char *tempname = NULL;
size_t templen;
char *joyname = NULL;
joyindex--; //SDL's Joystick System starts at 0, not 1
if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
{
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) != -1)
joyname = SDL_JoystickNameForIndex(joyindex);
{
tempname = SDL_JoystickNameForIndex(joyindex);
if (tempname)
{
templen = strlen(tempname);
joyname = malloc(templen*sizeof(char));
strcpy(joyname, tempname);
}
}
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
}
else
joyname = SDL_JoystickNameForIndex(joyindex);
{
tempname = SDL_JoystickNameForIndex(joyindex);
if (tempname)
{
templen = strlen(tempname);
joyname = malloc(templen*sizeof(char));
strcpy(joyname, tempname);
}
}
return joyname;
}

24
src/sdl12/i_system.c
View File

@ -1577,16 +1577,34 @@ INT32 I_NumJoys(void)
const char *I_GetJoyName(INT32 joyindex)
{
const char *joyname = "NA";
const char *tempname = NULL;
size_t templen;
char *joyname = NULL;
joyindex--; //SDL's Joystick System starts at 0, not 1
if (SDL_WasInit(SDL_INIT_JOYSTICK) == 0)
{
if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) != -1)
joyname = SDL_JoystickName(joyindex);
{
tempname = SDL_JoystickNameForIndex(joyindex);
if (tempname)
{
templen = strlen(tempname);
joyname = malloc(templen*sizeof(char));
strcpy(joyname, tempname);
}
}
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
}
else
joyname = SDL_JoystickName(joyindex);
{
tempname = SDL_JoystickNameForIndex(joyindex);
if (tempname)
{
templen = strlen(tempname);
joyname = malloc(templen*sizeof(char));
strcpy(joyname, tempname);
}
}
return joyname;
}