From c931c4ed06ecf8aac0c75b1095909d3e03dfa601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Sun, 18 Oct 2009 12:12:04 +0000 Subject: [PATCH] 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. --- src/channels.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/channels.c b/src/channels.c index 45d19820..f91dfb40 100644 --- a/src/channels.c +++ b/src/channels.c @@ -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);