From c174de392b90865c2ccf534acd428286da2d061f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Tue, 28 Feb 2006 12:36:52 +0100
Subject: [PATCH] Fixed updating the "Info" button in the "Timers" menu

---
 HISTORY  |  4 ++++
 config.h |  6 +++---
 menu.c   | 10 ++++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/HISTORY b/HISTORY
index 2b6cb5b7..bb7636cd 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4414,3 +4414,7 @@ Video Disk Recorder Revision History
   to be drawn with a transparent background (thanks to Alexander Hans).
 - Fixed cSchedule::GetFollowingEvent() in case there is currently no present event
   running (thanks to Pekka Mauno).
+
+2006-02-28: Version 1.3.45
+
+- Fixed updating the "Info" button in the "Timers" menu.
diff --git a/config.h b/config.h
index ff532d27..07f48cf5 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.246 2006/02/25 14:12:20 kls Exp $
+ * $Id: config.h 1.247 2006/02/28 12:23:28 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.44"
-#define VDRVERSNUM   10344  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.45"
+#define VDRVERSNUM   10345  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/menu.c b/menu.c
index d15c017f..0d555286 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.422 2006/02/25 15:41:40 kls Exp $
+ * $Id: menu.c 1.423 2006/02/28 12:15:43 kls Exp $
  */
 
 #include "menu.h"
@@ -690,8 +690,8 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
                              *timer = data;
                           if (addIfConfirmed)
                              Timers.Add(timer);
-                          timer->Matches();
                           timer->SetEventFromSchedule();
+                          timer->Matches();
                           Timers.SetModified();
                           isyslog("timer %s %s (%s)", *timer->ToDescr(), addIfConfirmed ? "added" : "modified", timer->HasFlags(tfActive) ? "active" : "inactive");
                           addIfConfirmed = false;
@@ -787,8 +787,10 @@ cMenuTimers::cMenuTimers(void)
 :cOsdMenu(tr("Timers"), 2, CHNUMWIDTH, 10, 6, 6)
 {
   helpKeys = -1;
-  for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer))
+  for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer)) {
+      timer->SetEventFromSchedule(); // make sure the event is current
       Add(new cMenuTimerItem(timer));
+      }
   Sort();
   SetCurrent(First());
   SetHelpKeys();
@@ -900,7 +902,7 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
        case kOk:     return Edit();
        case kRed:    state = OnOff(); break; // must go through SetHelpKeys()!
        case kGreen:  return New();
-       case kYellow: return Delete();
+       case kYellow: state = Delete(); break;
        case kBlue:   return Info();
                      break;
        default: break;