summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave <vdr@pickles.me.uk>2012-07-09 12:44:10 +0100
committerDave <vdr@pickles.me.uk>2012-07-09 12:44:10 +0100
commit749de48e3f9b486b73991e8bbe1270f978bf80ee (patch)
treee2df15d5d186137743af40e62dad04ff271b5d70
parentc7bb8d4f334000a7bb9f2824af16bf5b80993147 (diff)
downloadvdrtva-749de48e3f9b486b73991e8bbe1270f978bf80ee.tar.gz
vdrtva-749de48e3f9b486b73991e8bbe1270f978bf80ee.tar.bz2
Don't try to delete a running timer, also tell VDR if we do delete one.
-rw-r--r--vdrtva.c8
1 files 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());
}
}
}