mirror of https://github.com/encounter/SDL.git
Make sure we hold the joystick lock when updating the device state while opening it
This commit is contained in:
parent
d4e0d27c1c
commit
0a05b281f2
|
@ -573,8 +573,6 @@ SDL_JoystickOpen(int device_index)
|
||||||
joystick->next = SDL_joysticks;
|
joystick->next = SDL_joysticks;
|
||||||
SDL_joysticks = joystick;
|
SDL_joysticks = joystick;
|
||||||
|
|
||||||
SDL_UnlockJoysticks();
|
|
||||||
|
|
||||||
/* send initial battery event */
|
/* send initial battery event */
|
||||||
initial_power_level = joystick->epowerlevel;
|
initial_power_level = joystick->epowerlevel;
|
||||||
joystick->epowerlevel = SDL_JOYSTICK_POWER_UNKNOWN;
|
joystick->epowerlevel = SDL_JOYSTICK_POWER_UNKNOWN;
|
||||||
|
@ -582,6 +580,8 @@ SDL_JoystickOpen(int device_index)
|
||||||
|
|
||||||
driver->Update(joystick);
|
driver->Update(joystick);
|
||||||
|
|
||||||
|
SDL_UnlockJoysticks();
|
||||||
|
|
||||||
return joystick;
|
return joystick;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue