[vlc-commits] PulseAudio: fix crash on error path

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Nov 22 20:35:47 2012 +0200| [2d66a357a4a2bcdc627f6422bbc17efced040427] | committer: Rémi Denis-Courmont

PulseAudio: fix crash on error path

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2d66a357a4a2bcdc627f6422bbc17efced040427
---

 modules/audio_output/pulse.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index c80785b..75857ec 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -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;
 }