From d072cc6da2e109d0dc6b98375a1bab3a2ac83948 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Fri, 30 May 2003 18:00:00 +0200
Subject: =?UTF-8?q?Version=201.2.0pre1=20-=20Some=20corrections=20to=20the?=
 =?UTF-8?q?=20French=20OSD=20texts=20(thanks=20to=20Olivier=20Jacques).=20?=
 =?UTF-8?q?-=20Fixed=20some=20missing=20commas=20in=20i18n.c=20(thanks=20t?=
 =?UTF-8?q?o=20Dimitrios=20Dimitrakos=20for=20=20=20reporting=20this=20pro?=
 =?UTF-8?q?blem).=20-=20Some=20corrections=20to=20the=20Finnish=20OSD=20te?=
 =?UTF-8?q?xts=20(thanks=20to=20Niko=20Tarnanen=20and=20Rolf=20=20=20Ahren?=
 =?UTF-8?q?berg).=20-=20Completed=20the=20Italian=20OSD=20texts=20(thanks?=
 =?UTF-8?q?=20to=20Antonio=20Ospite).=20-=20Fixed=20breaking=20off=20repla?=
 =?UTF-8?q?y=20in=20case=20the=20user=20hits=20"Play"=20or=20"Pause"=20too?=
 =?UTF-8?q?=20soon=20after=20=20=20going=20into=20"Pause=20live=20video"?=
 =?UTF-8?q?=20mode=20(thanks=20to=20Karim=20Afifi=20for=20reporting=20ths?=
 =?UTF-8?q?=20one).=20-=20Some=20corrections=20to=20the=20Catalanian=20OSD?=
 =?UTF-8?q?=20texts=20(thanks=20to=20Jordi=20Vil=C3=A0).=20-=20Single=20ev?=
 =?UTF-8?q?ent=20timers=20are=20now=20deleted=20if=20the=20recording=20the?=
 =?UTF-8?q?y=20are=20doing=20is=20=20=20deleted=20before=20the=20timer=20e?=
 =?UTF-8?q?nds.=20-=20Fixed=20an=20uninitialized=20variable=20in=20cDispla?=
 =?UTF-8?q?yChannel=20(thanks=20to=20Stefan=20Huelswitt).=20-=20Fixed=20a?=
 =?UTF-8?q?=20possible=20access=20of=20invalid=20file=20handles=20in=20cSI?=
 =?UTF-8?q?Processor::Action()=20=20=20(thanks=20to=20Stefan=20Huelswitt).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 menu.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'menu.c')

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);
 }
-- 
cgit v1.2.3