epg: Correctly unlink from channels (avoid rearming timers causing se…

…gfault) Fixes tvheadend#553 Fixes tvheadend#533 Fixes tvheadend#513
mossroy · Jun 8, 2011 · f8710c7 · f8710c7
1 parent 24a833b
commit f8710c7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/epg.c b/src/epg.c
@@ -482,11 +482,12 @@ epg_unlink_from_channel(channel_t *ch)
 {
   event_t *e;
 
+  while((e = ch->ch_epg_events.root) != NULL)
+    epg_remove_event_from_channel(ch, e);
+
   gtimer_disarm(&ch->ch_epg_timer_head);
   gtimer_disarm(&ch->ch_epg_timer_current);
 
-  while((e = ch->ch_epg_events.root) != NULL)
-    epg_remove_event_from_channel(ch, e);
 }