From: Adam Sutton <dev@adamsutton.me.uk>
Date: Tue, 20 May 2014 21:48:01 +0000 (+0100)
Subject: mpegts network scan: fix stupid mistake on queue delete
X-Git-Tag: v4.1~1991
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac4cd7f057875a3f0934c5886395f8c577fd8d34;p=thirdparty%2Ftvheadend.git

mpegts network scan: fix stupid mistake on queue delete
---

diff --git a/src/input/mpegts/mpegts_network_scan.c b/src/input/mpegts/mpegts_network_scan.c
index ee20b8b66..bbb48b54e 100644
--- a/src/input/mpegts/mpegts_network_scan.c
+++ b/src/input/mpegts/mpegts_network_scan.c
@@ -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);