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

epggrab: ota - fix the frozen epggrab subscriptions, fixes #2365

Browse source
This commit is contained in:
Jaroslav Kysela 2014-10-14 21:19:29 +02:00
parent 6ba3b926fe
commit 3f4387b045
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/epggrab/otamux.c
View file

@ -65,6 +65,8 @@ static void epggrab_ota_timeout_cb ( void *p );
static void epggrab_ota_data_timeout_cb ( void *p );
static void epggrab_ota_kick_cb ( void *p );
static void epggrab_mux_start ( mpegts_mux_t *mm, void *p );
static void epggrab_ota_save ( epggrab_ota_mux_t *ota );
static void epggrab_ota_free ( epggrab_ota_head_t *head, epggrab_ota_mux_t *ota );
@ -506,6 +508,9 @@ next_one:
first = om;
} else {
kick = 0;
/* note: it is possible that the mux_start listener is not called */
/* for reshared mux subscriptions, so call it (maybe second time) here.. */
epggrab_mux_start(mm, NULL);
}
done:
@ -786,6 +791,7 @@ epggrab_ota_free ( epggrab_ota_head_t *head, epggrab_ota_mux_t *ota )
epggrab_ota_svc_link_t *svcl;
gtimer_disarm(&ota->om_timer);
gtimer_disarm(&ota->om_data_timer);
if (head != NULL)
TAILQ_REMOVE(head, ota, om_q_link);
RB_REMOVE(&epggrab_ota_all, ota, om_global_link);