From dc9238ec9fd1b5d0d0b56b683c71d648ea7060c3 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 18 Dec 2016 21:23:10 +0100 Subject: [PATCH] channels: fix list remove for epg linked channels (see #4134) --- src/channels.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.47.2