]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
mpegts network scan: fix mux scan cancel operation, fixes #4373
authorJaroslav Kysela <perex@perex.cz>
Sat, 13 May 2017 15:40:33 +0000 (17:40 +0200)
committerJaroslav Kysela <perex@perex.cz>
Sat, 13 May 2017 15:40:33 +0000 (17:40 +0200)
src/input/mpegts/mpegts_network_scan.c

index 47f2b7d560671c08d13bacc6c9b6bcf7801b78ba..e6a3804f00b40ec863684bbd1866c4dab130b64b 100644 (file)
@@ -171,11 +171,14 @@ mpegts_network_scan_mux_partial ( mpegts_mux_t *mm )
 void
 mpegts_network_scan_mux_cancel  ( mpegts_mux_t *mm, int reinsert )
 {
-  if (mm->mm_scan_state != MM_SCAN_STATE_ACTIVE)
-    return;
-
-  if (!reinsert)
+  if (reinsert) {
+    if (mm->mm_scan_state != MM_SCAN_STATE_ACTIVE)
+      return;
+  } else {
+    if (mm->mm_scan_state == MM_SCAN_STATE_IDLE)
+      return;
     mm->mm_scan_flags = 0;
+  }
 
   mpegts_network_scan_mux_done0(mm, MM_SCAN_NONE,
                                 reinsert ? mm->mm_scan_weight : 0);