From 1e11bc8c19f77625eaa5e59391a8f82d9278e81c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 14 Mar 2014 20:07:38 +0100 Subject: [PATCH] Fix the subscription_done() call The subscription_unsubscribe() must be called from the upper layer (like dvr). --- src/main.c | 2 +- src/subscriptions.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main.c b/src/main.c index 4216fee2..c419af2a 100644 --- a/src/main.c +++ b/src/main.c @@ -854,12 +854,12 @@ main(int argc, char **argv) tvhftrace("main", epggrab_done); tvhftrace("main", tcp_server_done); - tvhftrace("main", subscription_done); tvhftrace("main", descrambler_done); tvhftrace("main", service_mapper_done); tvhftrace("main", service_done); tvhftrace("main", channel_done); tvhftrace("main", dvr_done); + tvhftrace("main", subscription_done); tvhftrace("main", access_done); tvhftrace("main", epg_done); tvhftrace("main", avahi_done); diff --git a/src/subscriptions.c b/src/subscriptions.c index ebb6e2f3..94193084 100644 --- a/src/subscriptions.c +++ b/src/subscriptions.c @@ -763,12 +763,7 @@ subscription_init(void) void subscription_done(void) { - th_subscription_t *s; - - pthread_mutex_lock(&global_lock); - while ((s = LIST_FIRST(&subscriptions)) != NULL) - subscription_unsubscribe(s); - pthread_mutex_unlock(&global_lock); + assert(LIST_FIRST(&subscriptions) == NULL); } /* **************************************************************************