From 749de48e3f9b486b73991e8bbe1270f978bf80ee Mon Sep 17 00:00:00 2001 From: Dave Date: Mon, 9 Jul 2012 12:44:10 +0100 Subject: Don't try to delete a running timer, also tell VDR if we do delete one. --- vdrtva.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vdrtva.c b/vdrtva.c index c4b696f..ccb47dc 100644 --- a/vdrtva.c +++ b/vdrtva.c @@ -1514,8 +1514,12 @@ void cLinks::DeleteTimersForSCRID(const char *sCRID) if (eventcrid && chanda) { cString scrid = cString::sprintf("%s%s", chanda->DA(),eventcrid->sCRID()); if (!strcmp(scrid, sCRID)) { - isyslog ("vdrtva: deleting timer '%s' from deleted series %s", ti->File(), sCRID); - Timers.Del(ti); + if (!ti->Recording()) { + isyslog ("vdrtva: deleting timer '%s' from deleted series %s", ti->File(), sCRID); + Timers.Del(ti); + Timers.SetModified(); + } + else esyslog("vdrtva: cannot delete timer '%s': timer is recording", ti->File()); } } } -- cgit v1.2.3