From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 20 Jun 2018 13:08:03 +0000 (+0200)
Subject: mpegts input: do not join non-existent threads
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a92a27ae3069553dd8cbf1970d6da691c64d7996;p=thirdparty%2Ftvheadend.git

mpegts input: do not join non-existent threads
---

diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index 52f617ee6..51deeefcb 100644
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -1953,8 +1953,10 @@ mpegts_input_thread_stop ( mpegts_input_t *mi )
 
   /* Join threads (relinquish lock due to potential deadlock) */
   pthread_mutex_unlock(&global_lock);
-  pthread_join(mi->mi_input_tid, NULL);
-  pthread_join(mi->mi_table_tid, NULL);
+  if (mi->mi_input_tid)
+    pthread_join(mi->mi_input_tid, NULL);
+  if (mi->mi_table_tid)
+    pthread_join(mi->mi_table_tid, NULL);
   pthread_mutex_lock(&global_lock);
 }