]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
mpegts: mux - move stop PID timer call to appropriate place, fixes #4643
authorJaroslav Kysela <perex@perex.cz>
Mon, 2 Oct 2017 06:49:58 +0000 (08:49 +0200)
committerJaroslav Kysela <perex@perex.cz>
Mon, 2 Oct 2017 06:50:22 +0000 (08:50 +0200)
src/input/mpegts/mpegts_mux.c

index 74d7cef50c768fdb0c029a6ed326af47d5a40a9a..7880a062c49d911890ab8bb3a11a928ea17ae475 100644 (file)
@@ -745,9 +745,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
@@ -865,6 +862,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);