From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 27 May 2015 12:34:31 +0000 (+0200)
Subject: mpegts: input - check the running flag in the global lock, too
X-Git-Tag: v4.2.1~2449
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e56ca8936b571112181644742b21ea31034b1ccf;p=thirdparty%2Ftvheadend.git

mpegts: input - check the running flag in the global lock, too
---

diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index d7b4d06f2..4727bea45 100644
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -1329,13 +1329,15 @@ mpegts_input_table_thread ( void *aux )
     
     /* Process */
     pthread_mutex_lock(&global_lock);
-    if (mm != mtf->mtf_mux) {
-      mm = mtf->mtf_mux;
-      if (mm)
-        mpegts_mux_nice_name(mm, muxname, sizeof(muxname));
+    if (mi->mi_running) {
+      if (mm != mtf->mtf_mux) {
+        mm = mtf->mtf_mux;
+        if (mm)
+          mpegts_mux_nice_name(mm, muxname, sizeof(muxname));
+      }
+      if (mm && mm->mm_active)
+        mpegts_input_table_dispatch(mm, muxname, mtf->mtf_tsb, mtf->mtf_len);
     }
-    if (mm && mm->mm_active)
-      mpegts_input_table_dispatch(mm, muxname, mtf->mtf_tsb, mtf->mtf_len);
     pthread_mutex_unlock(&global_lock);
 
     /* Cleanup */