From: Adam Sutton <dev@adamsutton.me.uk>
Date: Tue, 25 Sep 2012 12:33:00 +0000 (+0100)
Subject: Ensure channelUpdate message is generated before previously referenced events are... 
X-Git-Tag: 3.3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=376e33d0edd83aa302b0046272b37d60a18e637a;p=thirdparty%2Ftvheadend.git

Ensure channelUpdate message is generated before previously referenced events are deleted.
---

diff --git a/src/epg.c b/src/epg.c
index 2f2ed758d..bec77bc29 100644
--- a/src/epg.c
+++ b/src/epg.c
@@ -1364,8 +1364,10 @@ static void _epg_channel_timer_callback ( void *p )
   channel_t *ch = (channel_t*)p;
 
   /* Clear now/next */
-  cur = ch->ch_epg_now;
-  nxt = ch->ch_epg_next;
+  if ((cur = ch->ch_epg_now))
+    cur->getref(cur);
+  if ((nxt = ch->ch_epg_next))
+    nxt->getref(nxt);
   ch->ch_epg_now = ch->ch_epg_next = NULL;
 
   /* Check events */
@@ -1412,6 +1414,10 @@ static void _epg_channel_timer_callback ( void *p )
            ch->ch_name);
     htsp_channel_update_current(ch);
   }
+
+  /* Remove refs */
+  if (cur) cur->putref(cur);
+  if (nxt) nxt->putref(nxt);
 }
 
 static epg_broadcast_t *_epg_channel_add_broadcast