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

Remove various abort()'s from channel.c (introduced when multi-threading

Browse source 
rewrite was commenced)
This commit is contained in:
Andreas Öman 2008-09-05 16:08:12 +00:00
parent d5d4293e1a
commit 853c4fe112
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
channels.c
View file

@ -341,7 +341,7 @@ channel_delete(channel_t *ch)
abort();//pvr_destroy_by_channel(ch);
while((t = LIST_FIRST(&ch->ch_transports)) != NULL) {
abort();//transport_unmap_channel(t);
transport_unmap_channel(t);
t->tht_config_change(t);
}
@ -350,7 +350,7 @@ channel_delete(channel_t *ch)
s->ths_channel = NULL;
}
abort();//epg_destroy_by_channel(ch);
epg_destroy_by_channel(ch);
abort();//autorec_destroy_by_channel(ch);
@ -386,9 +386,8 @@ channel_merge(channel_t *dst, channel_t *src)
src->ch_name, dst->ch_name);
while((t = LIST_FIRST(&src->ch_transports)) != NULL) {
abort();//transport_unmap_channel(t);
abort();//transport_map_channel(t, dst);
transport_unmap_channel(t);
transport_map_channel(t, dst);
t->tht_config_change(t);
}