]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
mpegts network scan: fix stupid mistake on queue delete
authorAdam Sutton <dev@adamsutton.me.uk>
Tue, 20 May 2014 21:48:01 +0000 (22:48 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Mon, 9 Jun 2014 21:08:40 +0000 (22:08 +0100)
src/input/mpegts/mpegts_network_scan.c

index ee20b8b66630a46b93acce65e755c3b8fd4ec130..bbb48b54ecfebfb535d30f6eb766bacbf2506a13 100644 (file)
@@ -159,8 +159,11 @@ mpegts_network_scan_mux_active ( mpegts_mux_t *mm )
 void
 mpegts_network_scan_queue_del ( mpegts_mux_t *mm )
 {
-  if (mm->mm_scan_state != MM_SCAN_STATE_IDLE)
+  if (mm->mm_scan_state == MM_SCAN_STATE_ACTIVE) {
     TAILQ_REMOVE(&mpegts_network_scan_active, mm, mm_scan_link);
+  } else if (mm->mm_scan_state == MM_SCAN_STATE_PEND) {
+    TAILQ_REMOVE(&mpegts_network_scan_pend, mm, mm_scan_link);
+  }
   mm->mm_scan_state = MM_SCAN_STATE_IDLE;
   gtimer_disarm(&mm->mm_scan_timeout);
   mpegts_network_scan_timer_arm(0);