pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sdl2

Browse source 
- fix ref counting on init, make sure you refcount each init calls and not just the first one
This commit is contained in:
Jørgen P. Tjernø 2013-02-25 16:52:50 -08:00
parent a3482e3ac0
commit ef5e7f5c65
1 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/SDL.c
View file

@ -105,10 +105,12 @@ SDL_InitSubSystem(Uint32 flags)
#endif #endif
/* Initialize the timer subsystem */ /* Initialize the timer subsystem */
if (SDL_PrivateShouldInitSubsystem(flags, SDL_INIT_TIMER)) { if ((flags & SDL_INIT_TIMER) ){
if (SDL_PrivateShouldInitSubsystem(flags, SDL_INIT_TIMER)) {
#if !SDL_TIMERS_DISABLED #if !SDL_TIMERS_DISABLED
if (SDL_TimerInit() < 0) { if (SDL_TimerInit() < 0) {
return (-1); return (-1);
}
} }
SDL_PrivateSubsystemRefCountIncr(SDL_INIT_TIMER); SDL_PrivateSubsystemRefCountIncr(SDL_INIT_TIMER);
#else #else
@ -118,10 +120,12 @@ SDL_InitSubSystem(Uint32 flags)
} }
/* Initialize the video/event subsystem */ /* Initialize the video/event subsystem */
if (SDL_PrivateShouldInitSubsystem(flags, SDL_INIT_VIDEO)) { if ((flags & SDL_INIT_VIDEO) ){
if (SDL_PrivateShouldInitSubsystem(flags, SDL_INIT_VIDEO)) {
#if !SDL_VIDEO_DISABLED #if !SDL_VIDEO_DISABLED
if (SDL_VideoInit(NULL) < 0) { if (SDL_VideoInit(NULL) < 0) {
return (-1); return (-1);
}
} }
SDL_PrivateSubsystemRefCountIncr(SDL_INIT_VIDEO); SDL_PrivateSubsystemRefCountIncr(SDL_INIT_VIDEO);
#else #else
@ -131,10 +135,12 @@ SDL_InitSubSystem(Uint32 flags)
} }
/* Initialize the audio subsystem */ /* Initialize the audio subsystem */
if (SDL_PrivateShouldInitSubsystem(flags, SDL_INIT_AUDIO)) { if ((flags & SDL_INIT_AUDIO) ){
if (SDL_PrivateShouldInitSubsystem(flags, SDL_INIT_AUDIO)) {
#if !SDL_AUDIO_DISABLED #if !SDL_AUDIO_DISABLED
if (SDL_AudioInit(NULL) < 0) { if (SDL_AudioInit(NULL) < 0) {
return (-1); return (-1);
}
} }
SDL_PrivateSubsystemRefCountIncr(SDL_INIT_AUDIO); SDL_PrivateSubsystemRefCountIncr(SDL_INIT_AUDIO);
#else #else
@ -149,10 +155,12 @@ SDL_InitSubSystem(Uint32 flags)
} }
/* Initialize the joystick subsystem */ /* Initialize the joystick subsystem */
if (SDL_PrivateShouldInitSubsystem(flags, SDL_INIT_JOYSTICK)) { if ((flags & SDL_INIT_JOYSTICK) ){
if (SDL_PrivateShouldInitSubsystem(flags, SDL_INIT_JOYSTICK)) {
#if !SDL_JOYSTICK_DISABLED #if !SDL_JOYSTICK_DISABLED
if (SDL_JoystickInit() < 0) { if (SDL_JoystickInit() < 0) {
return (-1); return (-1);
}
} }
SDL_PrivateSubsystemRefCountIncr(SDL_INIT_JOYSTICK); SDL_PrivateSubsystemRefCountIncr(SDL_INIT_JOYSTICK);
#else #else
@ -161,10 +169,12 @@ SDL_InitSubSystem(Uint32 flags)
#endif #endif
} }
if (SDL_PrivateShouldInitSubsystem(flags, SDL_INIT_GAMECONTROLLER)) { if ((flags & SDL_INIT_GAMECONTROLLER) ){
if (SDL_PrivateShouldInitSubsystem(flags, SDL_INIT_GAMECONTROLLER)) {
#if !SDL_JOYSTICK_DISABLED #if !SDL_JOYSTICK_DISABLED
if (SDL_GameControllerInit() < 0) { if (SDL_GameControllerInit() < 0) {
return (-1); return (-1);
}
} }
SDL_PrivateSubsystemRefCountIncr(SDL_INIT_GAMECONTROLLER); SDL_PrivateSubsystemRefCountIncr(SDL_INIT_GAMECONTROLLER);
#else #else
@ -174,10 +184,12 @@ SDL_InitSubSystem(Uint32 flags)
} }
/* Initialize the haptic subsystem */ /* Initialize the haptic subsystem */
if (SDL_PrivateShouldInitSubsystem(flags, SDL_INIT_HAPTIC)) { if ((flags & SDL_INIT_HAPTIC) ){
if (SDL_PrivateShouldInitSubsystem(flags, SDL_INIT_HAPTIC)) {
#if !SDL_HAPTIC_DISABLED #if !SDL_HAPTIC_DISABLED
if (SDL_HapticInit() < 0) { if (SDL_HapticInit() < 0) {
return (-1); return (-1);
}
} }
SDL_PrivateSubsystemRefCountIncr(SDL_INIT_HAPTIC); SDL_PrivateSubsystemRefCountIncr(SDL_INIT_HAPTIC);
#else #else