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

subscriptions: Fix crash when subscription is in the remove queue list, but unsubscribed before

Browse source
This commit is contained in:
Jaroslav Kysela 2015-03-17 14:08:26 +01:00
parent 74adbe8f7d
commit e16a5ca3d1
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/subscriptions.c
View file

@ -336,10 +336,8 @@ subscription_reschedule(void)
subscription_show_info(s);
}
while ((s = LIST_FIRST(&subscriptions_remove))) {
LIST_REMOVE(s, ths_remove_link);
while ((s = LIST_FIRST(&subscriptions_remove)))
subscription_unsubscribe(s, 0);
}
if (postpone <= 0 || postpone == INT_MAX)
postpone = 2;
@ -513,6 +511,7 @@ subscription_unsubscribe(th_subscription_t *s, int quiet)
service_instance_list_clear(&s->ths_instances);
LIST_REMOVE(s, ths_global_link);
LIST_SAFE_REMOVE(s, ths_remove_link);
#if ENABLE_MPEGTS
if (s->ths_raw_service)