From 55059017fa778b3ac66bc905da9385964503e0db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Sun, 30 Aug 2009 19:56:29 +0000 Subject: [PATCH] * If a user changed the XMLTV source for a channel to 'None', tvheadend would crash. This is now fixed. --- debian/changelog | 3 +++ src/channels.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 10dc7d18..e728727b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ hts-tvheadend (2.6) hts; urgency=low * Add support for sattelite beams with circular polarisation + * If a user changed the XMLTV source for a channel to 'None', tvheadend + would crash. This is now fixed. + hts-tvheadend (2.5) hts; urgency=low * If a previosly detected DVB adapter was not present during startup, diff --git a/src/channels.c b/src/channels.c index 70a0e86d..8238a4d6 100644 --- a/src/channels.c +++ b/src/channels.c @@ -472,7 +472,8 @@ channel_set_xmltv_source(channel_t *ch, xmltv_channel_t *xc) } ch->ch_xc = xc; - tvh_str_update(&ch->ch_icon, xc->xc_icon); + if(xc != NULL) + tvh_str_update(&ch->ch_icon, xc->xc_icon); channel_save(ch); }