When deleting a channel, send delete notification to HTSP after we've poked around in the EPG, etc.

We want the delete message over HTSP to come after all else.
This commit is contained in:
Andreas Öman 2009-10-18 12:12:04 +00:00
parent 02dd003832
commit c931c4ed06

View file

@ -382,8 +382,6 @@ channel_delete(channel_t *ch)
while((ctm = LIST_FIRST(&ch->ch_ctms)) != NULL)
channel_tag_mapping_destroy(ctm, CTM_DESTROY_UPDATE_TAG);
htsp_channel_delete(ch);
tvhlog(LOG_NOTICE, "channels", "Channel \"%s\" deleted",
ch->ch_name);
@ -403,6 +401,8 @@ channel_delete(channel_t *ch)
hts_settings_remove("channels/%d", ch->ch_id);
htsp_channel_delete(ch);
RB_REMOVE(&channel_name_tree, ch, ch_name_link);
RB_REMOVE(&channel_identifier_tree, ch, ch_identifier_link);