mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 01:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(SDL) Fix double initialization

Browse Source 
Signed-off-by: Higor Eurípedes <heuripedes@gmail.com>
This commit is contained in:
Higor Eurípedes 2014-08-15 19:25:27 -03:00
parent 0f7c67daab
commit e88f3b4355
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
audio/sdl_audio.c
View File

@ -60,8 +60,11 @@ static inline int find_num_frames(int rate, int latency)
static void *sdl_audio_init(const char *device, unsigned rate, unsigned latency) static void *sdl_audio_init(const char *device, unsigned rate, unsigned latency)
{ {
(void)device; (void)device;
if (SDL_WasInit(0) == 0 && SDL_Init(SDL_INIT_AUDIO) < 0) if (SDL_WasInit(0) == 0)
return NULL; {
if (SDL_Init(SDL_INIT_AUDIO) < 0)
return NULL;
}
else if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) else if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
return NULL; return NULL;

7
gfx/sdl2_gfx.c
View File

@ -369,8 +369,11 @@ static void *sdl2_gfx_init(const video_info_t *video, const input_driver_t **inp
int i; int i;
if (SDL_WasInit(0) == 0 && SDL_Init(SDL_INIT_VIDEO) < 0) if (SDL_WasInit(0) == 0)
return NULL; {
if (SDL_Init(SDL_INIT_VIDEO) < 0)
return NULL;
}
else if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0) else if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
return NULL; return NULL;

7
input/sdl_joypad.c
View File

@ -124,8 +124,11 @@ static void sdl_joypad_destroy(void)
static bool sdl_joypad_init(void) static bool sdl_joypad_init(void)
{ {
unsigned i; unsigned i;
if (SDL_WasInit(0) == 0 && SDL_Init(SDL_INIT_JOYSTICK) < 0) if (SDL_WasInit(0) == 0)
return false; {
if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
return false;
}
else if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0) else if (SDL_InitSubSystem(SDL_INIT_JOYSTICK) < 0)
return false; return false;