stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

epggrab: ensure that grabs that timeout will unsubscribe

Browse source
This commit is contained in:
Adam Sutton 2013-09-21 19:45:55 +01:00
parent 6710be3c59
commit 4f16c2eed5
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/epggrab/otamux.c
View file

@ -104,11 +104,17 @@ epggrab_ota_timeout ( epggrab_ota_mux_t *ota )
static void
epggrab_ota_done ( epggrab_ota_mux_t *ota, int timeout )
{
mpegts_mux_t *mm;
LIST_REMOVE(ota, om_q_link);
ota->om_active = 0;
ota->om_when = dispatch_clock + epggrab_ota_period(ota);
LIST_INSERT_SORTED(&epggrab_ota_pending, ota, om_q_link, om_time_cmp);
/* Remove subscriber */
if ((mm = mpegts_mux_find(ota->om_mux_uuid)))
mpegts_mux_unsubscribe_by_name(mm, "epggrab");
/* Re-arm */
if (LIST_FIRST(&epggrab_ota_pending) == ota)
epggrab_ota_pending_timer_cb(NULL);
@ -236,7 +242,6 @@ epggrab_ota_complete
{
int done = 1;
epggrab_ota_map_t *map;
mpegts_mux_t *mm;
tvhinfo(mod->id, "grab complete");
/* Test for completion */
@ -249,10 +254,6 @@ epggrab_ota_complete
}
if (!done) return;
/* Remove subscriber */
if ((mm = mpegts_mux_find(ota->om_mux_uuid)))
mpegts_mux_unsubscribe_by_name(mm, "epggrab");
/* Done */
epggrab_ota_done(ota, 0);
}