From f8f80484c29d611c2697b497c986de7313b3e8f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Wed, 5 Aug 2009 08:25:48 +0000 Subject: [PATCH] If XMLTV grabbing was disabled tvheadend would spin in a 100% CPU loop. This is now fixed. --- debian/changelog | 3 +++ src/xmltv.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 22431395..eac361dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ hts-tvheadend (2.5) hts; urgency=low * If a previosly detected DVB adapters was not present during startup, Tvheadend would crash. This is now fixed. + * If XMLTV grabbing was disabled tvheadend would spin in a 100% CPU loop. + This is now fixed. + hts-tvheadend (2.4) hts; urgency=low * Due to a bug, the polarisation of DVB-S muxes was not correctly diff --git a/src/xmltv.c b/src/xmltv.c index db03b1ea..995210ff 100644 --- a/src/xmltv.c +++ b/src/xmltv.c @@ -484,13 +484,13 @@ xmltv_thread(void *aux) break; } + confver = xmltv_confver; + if(xmltv_grab_enabled == 0) continue; ts.tv_sec = time(NULL) + xmltv_grab_interval * 3600; - confver = xmltv_confver; - if(xg_current != NULL) { tvhlog(LOG_INFO, "xmltv", "Grabbing \"%s\" using command \"%s\"",