diff options
author | Jarkko Suontausta <jarkko.suontausta@digia.com> | 2012-05-22 15:58:33 +0300 |
---|---|---|
committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2012-05-29 09:24:27 +0530 |
commit | 0236977408b92259086010e69b2d64361d52391c (patch) | |
tree | b11528cdbb400ad9067344908894e34a4e4c7af4 | |
parent | 54718450dfd1e7fc9b5946f62765f7451a854385 (diff) |
bluetooth: Release transport when the pa_rtpoll_run loop finishes.
Based on a patch by Marko Ollonen.
-rw-r--r-- | src/modules/bluetooth/module-bluetooth-device.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/modules/bluetooth/module-bluetooth-device.c b/src/modules/bluetooth/module-bluetooth-device.c index 0b12cc7b6..68c4efc70 100644 --- a/src/modules/bluetooth/module-bluetooth-device.c +++ b/src/modules/bluetooth/module-bluetooth-device.c @@ -1731,11 +1731,18 @@ static void thread_func(void *userdata) { pollfd->events = (short) (((u->sink && PA_SINK_IS_LINKED(u->sink->thread_info.state) && !writable) ? POLLOUT : 0) | (u->source && PA_SOURCE_IS_LINKED(u->source->thread_info.state) ? POLLIN : 0)); - if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) + if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) { + pa_log_debug("pa_rtpoll_run failed with: %d", ret); goto fail; - - if (ret == 0) + } + if (ret == 0) { + pa_log_debug("IO thread shutdown requested, stopping cleanly"); + if (u->transport) + bt_transport_release(u); + else + stop_stream_fd(u); goto finish; + } pollfd = u->rtpoll_item ? pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL) : NULL; |