From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 2 Oct 2017 06:49:58 +0000 (+0200)
Subject: mpegts: mux - move stop PID timer call to appropriate place, fixes #4643
X-Git-Tag: v4.2.4~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7408defe86c7da3f8e2ffb5387234b98d0729de3;p=thirdparty%2Ftvheadend.git

mpegts: mux - move stop PID timer call to appropriate place, fixes #4643
---

diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index 0b00af164..f02c9c535 100644
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -721,9 +721,6 @@ mpegts_mux_do_stop ( mpegts_mux_t *mm, int delconf )
   while ((s = LIST_FIRST(&mm->mm_services))) {
     service_destroy((service_t*)s, delconf);
   }
-
-  /* Stop PID timer */
-  mtimer_disarm(&mm->mm_update_pids_timer);
 }
 
 void
@@ -841,6 +838,7 @@ mpegts_mux_stop ( mpegts_mux_t *mm, int force, int reason )
     return;
 
   mi->mi_stopping_mux(mi, mmi);
+  mtimer_disarm(&mm->mm_update_pids_timer); /* Stop PID timer */
   mi->mi_stop_mux(mi, mmi);
   mi->mi_stopped_mux(mi, mmi);