[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, stable-queue, updated. v0.9.21-68-g22f708a

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The stable-queue branch has been updated
      from  e8b83fa7c6aefdfcc372f2d1f0a18c78a1664164 (commit)

- Log -----------------------------------------------------------------
22f708a Revert "Fix crash on jack server shutdown"
-----------------------------------------------------------------------

Summary of changes:
 src/modules/jack/module-jack-sink.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------

commit 22f708a1ece613e011ec8740530b1ed40459891d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Mar 22 17:28:53 2010 +0100

    Revert "Fix crash on jack server shutdown"
    
    This reverts commit e756467434f787d392c45aac1327768bcf0b610c.
    
    The patch is incomplete and not entirely correct.

diff --git a/src/modules/jack/module-jack-sink.c b/src/modules/jack/module-jack-sink.c
index e4467d3..9f3e071 100644
--- a/src/modules/jack/module-jack-sink.c
+++ b/src/modules/jack/module-jack-sink.c
@@ -475,12 +475,12 @@ void pa__done(pa_module*m) {
     if (!(u = m->userdata))
         return;
 
-    if (u->sink)
-        pa_sink_unlink(u->sink);
-
     if (u->client)
         jack_client_close(u->client);
 
+    if (u->sink)
+        pa_sink_unlink(u->sink);
+
     if (u->thread) {
         pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL);
         pa_thread_free(u->thread);

-- 
hooks/post-receive
PulseAudio Sound Server