encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't corrupt XInput device state during SDL_SYS_JoystickClose().

This commit is contained in:
Ryan C. Gordon 2013-08-28 22:07:54 -04:00
parent 2538d31140
commit ea4350d821
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/joystick/windows/SDL_dxjoystick.c
View File

@ -1552,21 +1552,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick * joystick)
void void
SDL_SYS_JoystickClose(SDL_Joystick * joystick) SDL_SYS_JoystickClose(SDL_Joystick * joystick)
{ {
if ( joystick->hwdata->bXInputDevice ) if (!joystick->hwdata->bXInputDevice) {
{
JoyStick_DeviceData *joysticklist = SYS_Joystick;
/* scan the opened joysticks and clear the userid for this instance */
for( ; joysticklist; joysticklist = joysticklist->pNext)
{
if ( joysticklist->bXInputDevice && joysticklist->nInstanceID == joystick->instance_id )
{
joysticklist->XInputUserId = INVALID_XINPUT_USERID;
}
}
}
else
{
IDirectInputDevice8_Unacquire(joystick->hwdata->InputDevice); IDirectInputDevice8_Unacquire(joystick->hwdata->InputDevice);
IDirectInputDevice8_Release(joystick->hwdata->InputDevice); IDirectInputDevice8_Release(joystick->hwdata->InputDevice);
} }