Set audio callback function pointers to NULL during uninit_audio -

should fix Dinothawr crash when selecting 'Close Content'
This commit is contained in:
twinaphex 2015-07-08 19:08:43 +02:00
parent c6992b3a6a
commit 3aff5a3ee2

View File

@ -315,6 +315,12 @@ void uninit_audio(void)
rarch_resampler_freep(&driver->resampler, rarch_resampler_freep(&driver->resampler,
&driver->resampler_data); &driver->resampler_data);
if (audio_data.audio_callback.callback)
{
audio_data.audio_callback.callback = NULL;
audio_data.audio_callback.set_state = NULL;
}
if (audio_data.data) if (audio_data.data)
free(audio_data.data); free(audio_data.data);
audio_data.data = NULL; audio_data.data = NULL;
@ -475,18 +481,7 @@ void init_audio(void)
return; return;
error: error:
if (audio_data.conv_outsamples) uninit_audio();
free(audio_data.conv_outsamples);
audio_data.conv_outsamples = NULL;
if (audio_data.data)
free(audio_data.data);
audio_data.data = NULL;
if (audio_data.rewind_buf)
free(audio_data.rewind_buf);
audio_data.rewind_buf = NULL;
if (audio_data.outsamples)
free(audio_data.outsamples);
audio_data.outsamples = NULL;
} }
bool audio_driver_mute_toggle(void) bool audio_driver_mute_toggle(void)