From 9c8dde32f54c4d5c9bdd30c7baf2371d89f670fe Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 19 Mar 2015 15:42:14 +0100 Subject: [PATCH] main: finish tcp connections (thus subscriptions) before mpegts done call --- src/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.c b/src/main.c index e4e0f791..5d4ef3e0 100644 --- a/src/main.c +++ b/src/main.c @@ -934,10 +934,8 @@ main(int argc, char **argv) tvhftrace("main", http_server_done); tvhftrace("main", webui_done); tvhftrace("main", fsmonitor_done); -#if ENABLE_MPEGTS - tvhftrace("main", mpegts_done); -#endif tvhftrace("main", http_client_done); + tvhftrace("main", tcp_server_done); // Note: the locking is obviously a bit redundant, but without // we need to disable the gtimer_arm call in epg_save() @@ -950,7 +948,9 @@ main(int argc, char **argv) pthread_mutex_unlock(&global_lock); tvhftrace("main", epggrab_done); - tvhftrace("main", tcp_server_done); +#if ENABLE_MPEGTS + tvhftrace("main", mpegts_done); +#endif tvhftrace("main", descrambler_done); tvhftrace("main", service_mapper_done); tvhftrace("main", service_done);