]> git.sesse.net Git - vlc/commitdiff
PulseAudio: fix crash on error path
authorRémi Denis-Courmont <remi@remlab.net>
Thu, 22 Nov 2012 18:35:47 +0000 (20:35 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Thu, 22 Nov 2012 18:36:03 +0000 (20:36 +0200)
modules/audio_output/pulse.c

index c80785b8c93d4d27e91e65bb3025792674ed4cd8..75857ec98b357f84eb4bae32c5047b798e7facfe 100644 (file)
@@ -886,14 +886,15 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
         fmt->i_rate = spec->rate;
 
     stream_buffer_attr_cb(s, aout);
-    var_AddCallback (aout, "audio-device", StreamMove, s);
     stream_moved_cb(s, aout);
     pa_threaded_mainloop_unlock(sys->mainloop);
+    var_AddCallback (aout, "audio-device", StreamMove, s);
 
     return VLC_SUCCESS;
 
 fail:
     pa_threaded_mainloop_unlock(sys->mainloop);
+    var_AddCallback (aout, "audio-device", StreamMove, s);
     Stop(aout);
     return VLC_EGENERIC;
 }