summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-03-22 17:28:53 +0100
committerLennart Poettering <lennart@poettering.net>2010-03-22 17:28:53 +0100
commit22f708a1ece613e011ec8740530b1ed40459891d (patch)
treeee692da7ac5dfc363ebc0385ddc31525d85ce1a2 /src
parente8b83fa7c6aefdfcc372f2d1f0a18c78a1664164 (diff)
Revert "Fix crash on jack server shutdown"
This reverts commit e756467434f787d392c45aac1327768bcf0b610c. The patch is incomplete and not entirely correct.
Diffstat (limited to 'src')
-rw-r--r--src/modules/jack/module-jack-sink.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/jack/module-jack-sink.c b/src/modules/jack/module-jack-sink.c
index e4467d32..9f3e071f 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);