aout: fix cleanup after error

e4ed088f · Rémi Denis-Courmont · e1881378 · e4ed088f
Commit e4ed088f authored Jul 22, 2012 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

src/audio_output/dec.c src/audio_output/dec.c +5 -2

No files found.
--- a/src/audio_output/dec.c
+++ b/src/audio_output/dec.c
@@ -133,8 +133,11 @@ void aout_Shutdown (audio_output_t *p_aout)
        aout_InputDelete (p_aout, input);
    owner->input = NULL;

-    aout_OutputDelete( p_aout );
-    aout_volume_Delete (owner->volume);
+    if (likely(owner->module != NULL))
+    {
+        aout_OutputDelete( p_aout );
+        aout_volume_Delete (owner->volume);
+    }
    var_Destroy( p_aout, "audio-device" );
    var_Destroy( p_aout, "audio-channels" );