From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 18 Dec 2016 20:23:10 +0000 (+0100)
Subject: channels: fix list remove for epg linked channels (see #4134)
X-Git-Tag: v4.2.1~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc9238ec9fd1b5d0d0b56b683c71d648ea7060c3;p=thirdparty%2Ftvheadend.git

channels: fix list remove for epg linked channels (see #4134)
---

diff --git a/src/channels.c b/src/channels.c
index 11d9a35dd..b483ab645 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -1062,13 +1062,13 @@ channel_delete ( channel_t *ch, int delconf )
   epggrab_channel_rem(ch);
   epg_channel_unlink(ch);
   if (ch->ch_epg_parent) {
-    LIST_REMOVE(ch, ch_epg_slave_link);
+    LIST_SAFE_REMOVE(ch, ch_epg_slave_link);
     free(ch->ch_epg_parent);
     ch->ch_epg_parent = NULL;
   }
   for (ch1 = LIST_FIRST(&ch->ch_epg_slaves); ch1; ch1 = ch2) {
     ch2 = LIST_NEXT(ch1, ch_epg_slave_link);
-    LIST_REMOVE(ch1, ch_epg_slave_link);
+    LIST_SAFE_REMOVE(ch1, ch_epg_slave_link);
     if (delconf) {
       free(ch1->ch_epg_parent);
       ch1->ch_epg_parent = NULL;