summaryrefslogtreecommitdiff
path: root/menu.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2003-05-30 18:00:00 +0200
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2003-05-30 18:00:00 +0200
commitd072cc6da2e109d0dc6b98375a1bab3a2ac83948 (patch)
treeed8f998f778fca488ddb5299e738cb36b42dff38 /menu.c
parent8ab980e1d9be404a8842fad54aa9c2e34fa6f4ea (diff)
downloadvdr-patch-lnbsharing-d072cc6da2e109d0dc6b98375a1bab3a2ac83948.tar.gz
vdr-patch-lnbsharing-d072cc6da2e109d0dc6b98375a1bab3a2ac83948.tar.bz2
Version 1.2.0pre1vdr-1.2.0pre1
- Some corrections to the French OSD texts (thanks to Olivier Jacques). - Fixed some missing commas in i18n.c (thanks to Dimitrios Dimitrakos for reporting this problem). - Some corrections to the Finnish OSD texts (thanks to Niko Tarnanen and Rolf Ahrenberg). - Completed the Italian OSD texts (thanks to Antonio Ospite). - Fixed breaking off replay in case the user hits "Play" or "Pause" too soon after going into "Pause live video" mode (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. - Fixed an uninitialized variable in cDisplayChannel (thanks to Stefan Huelswitt). - Fixed a possible access of invalid file handles in cSIProcessor::Action() (thanks to Stefan Huelswitt).
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/menu.c b/menu.c
index 9fb3750..ecf2493 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.249 2003/05/25 14:06:17 kls Exp $
+ * $Id: menu.c 1.253 2003/05/30 09:53:57 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();
}
}
@@ -2636,7 +2641,8 @@ cDisplayChannel::cDisplayChannel(eKeys FirstKey)
lines = 0;
number = 0;
lastTime = time_ms();
- int EpgLines = Setup.ShowInfoOnChSwitch ? 5 : 1;
+ withInfo = Setup.ShowInfoOnChSwitch;
+ int EpgLines = withInfo ? 5 : 1;
Interface->Open(Setup.OSDwidth, Setup.ChannelInfoPos ? EpgLines : -EpgLines);
ProcessKey(FirstKey);
}