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

audio: Fix crash calling SDL_OpenAudio() after SDL_AudioInit() fails 

The SDL_WasInit() checks don't work when using SDL_AudioInit() directly,
which is exactly what audio_initOpenCloseQuitAudio() in testautomation
does.
This commit is contained in:
Cameron Gutman 2021-11-12 17:07:22 -06:00
parent 78013aeef9
commit 704edf6323
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/audio/SDL_audio.c
View File

@ -960,7 +960,7 @@ SDL_AudioInit(const char *driver_name)
int initialized = 0; int initialized = 0;
int tried_to_init = 0; int tried_to_init = 0;
if (SDL_WasInit(SDL_INIT_AUDIO)) { if (SDL_GetCurrentAudioDriver()) {
SDL_AudioQuit(); /* shutdown driver if already running. */ SDL_AudioQuit(); /* shutdown driver if already running. */
} }
@ -1091,7 +1091,7 @@ SDL_GetNumAudioDevices(int iscapture)
{ {
int retval = 0; int retval = 0;
if (!SDL_WasInit(SDL_INIT_AUDIO)) { if (!SDL_GetCurrentAudioDriver()) {
return -1; return -1;
} }
@ -1116,7 +1116,7 @@ SDL_GetAudioDeviceName(int index, int iscapture)
{ {
const char *retval = NULL; const char *retval = NULL;
if (!SDL_WasInit(SDL_INIT_AUDIO)) { if (!SDL_GetCurrentAudioDriver()) {
SDL_SetError("Audio subsystem is not initialized"); SDL_SetError("Audio subsystem is not initialized");
return NULL; return NULL;
} }
@ -1160,7 +1160,7 @@ SDL_GetAudioDeviceSpec(int index, int iscapture, SDL_AudioSpec *spec)
SDL_zerop(spec); SDL_zerop(spec);
if (!SDL_WasInit(SDL_INIT_AUDIO)) { if (!SDL_GetCurrentAudioDriver()) {
return SDL_SetError("Audio subsystem is not initialized"); return SDL_SetError("Audio subsystem is not initialized");
} }
@ -1308,7 +1308,7 @@ open_audio_device(const char *devname, int iscapture,
void *handle = NULL; void *handle = NULL;
int i = 0; int i = 0;
if (!SDL_WasInit(SDL_INIT_AUDIO)) { if (!SDL_GetCurrentAudioDriver()) {
SDL_SetError("Audio subsystem is not initialized"); SDL_SetError("Audio subsystem is not initialized");
return 0; return 0;
} }