]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
mpegts input: do not join non-existent threads
authorJaroslav Kysela <perex@perex.cz>
Wed, 20 Jun 2018 13:08:03 +0000 (15:08 +0200)
committerJaroslav Kysela <perex@perex.cz>
Mon, 2 Jul 2018 13:28:27 +0000 (15:28 +0200)
src/input/mpegts/mpegts_input.c

index e5e439e607494dc9c1e28567bc0135c1b432b94a..01e45e65e5a15e35067bf1d68a4945c77338ffa1 100644 (file)
@@ -1814,8 +1814,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);
 }