From 57f49a2ad2f04097b66e2f703e8462e43f4c9675 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Sat, 8 Jun 2013 13:07:44 +0100 Subject: [PATCH] mpegts: ensure that init scan timer is stopped when cancelling. THis happens when a sub kicks the mux out and caused an assert() on bad scan status (at timeout). --- src/input/mpegts/mpegts_mux.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c index dff577bd..47212e7a 100644 --- a/src/input/mpegts/mpegts_mux.c +++ b/src/input/mpegts/mpegts_mux.c @@ -279,6 +279,7 @@ mpegts_mux_stop ( mpegts_mux_t *mm ) mpegts_network_t *mn = mm->mm_network; TAILQ_REMOVE(&mn->mn_initial_scan_current_queue, mm, mm_initial_scan_link); mm->mm_initial_scan_status = MM_SCAN_PENDING; + gtimer_disarm(&mm->mm_initial_scan_timeout); TAILQ_INSERT_TAIL(&mn->mn_initial_scan_pending_queue, mm, mm_initial_scan_link); mpegts_network_schedule_initial_scan(mn); }