summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY2
-rw-r--r--menu.c7
2 files changed, 8 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 0adfe28e..382451b7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2221,3 +2221,5 @@ Video Disk Recorder Revision History
breaking off replay in case the user hits "Play" or "Pause" too soon (thanks
to Karim Afifi for reporting ths one).
- Some corrections to the Catalanian OSD texts (thanks to Jordi Vilà).
+- Single event timers are now deleted if the recording they are doing is
+ deleted before the timer ends.
diff --git a/menu.c b/menu.c
index 22b78718..85b94bed 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.250 2003/05/29 09:35:28 kls Exp $
+ * $Id: menu.c 1.251 2003/05/29 11:35:52 kls Exp $
*/
#include "menu.h"
@@ -1862,6 +1862,11 @@ eOSState cMenuRecordings::Delete(void)
if (timer) {
timer->Skip();
cRecordControls::Process(time(NULL));
+ if (timer->IsSingleEvent()) {
+ int Index = timer->Index();
+ Timers.Del(timer);
+ isyslog("timer %d deleted", Index + 1);
+ }
Timers.Save();
}
}