frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed updating the "Info" button in the "Timers" menu

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-02-28 12:36:52 +01:00
parent 58985f6dc1
commit c174de392b
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -4414,3 +4414,7 @@ Video Disk Recorder Revision History
to be drawn with a transparent background (thanks to Alexander Hans). to be drawn with a transparent background (thanks to Alexander Hans).
- Fixed cSchedule::GetFollowingEvent() in case there is currently no present event - Fixed cSchedule::GetFollowingEvent() in case there is currently no present event
running (thanks to Pekka Mauno). running (thanks to Pekka Mauno).
2006-02-28: Version 1.3.45
- Fixed updating the "Info" button in the "Timers" menu.

6
config.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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 #ifndef __CONFIG_H
@ -19,8 +19,8 @@
#include "i18n.h" #include "i18n.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.3.44" #define VDRVERSION "1.3.45"
#define VDRVERSNUM 10344 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10345 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99 #define MAXPRIORITY 99
#define MAXLIFETIME 99 #define MAXLIFETIME 99

10
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "menu.h"
@ -690,8 +690,8 @@ eOSState cMenuEditTimer::ProcessKey(eKeys Key)
*timer = data; *timer = data;
if (addIfConfirmed) if (addIfConfirmed)
Timers.Add(timer); Timers.Add(timer);
timer->Matches();
timer->SetEventFromSchedule(); timer->SetEventFromSchedule();
timer->Matches();
Timers.SetModified(); Timers.SetModified();
isyslog("timer %s %s (%s)", *timer->ToDescr(), addIfConfirmed ? "added" : "modified", timer->HasFlags(tfActive) ? "active" : "inactive"); isyslog("timer %s %s (%s)", *timer->ToDescr(), addIfConfirmed ? "added" : "modified", timer->HasFlags(tfActive) ? "active" : "inactive");
addIfConfirmed = false; addIfConfirmed = false;
@ -787,8 +787,10 @@ cMenuTimers::cMenuTimers(void)
:cOsdMenu(tr("Timers"), 2, CHNUMWIDTH, 10, 6, 6) :cOsdMenu(tr("Timers"), 2, CHNUMWIDTH, 10, 6, 6)
{ {
helpKeys = -1; 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)); Add(new cMenuTimerItem(timer));
}
Sort(); Sort();
SetCurrent(First()); SetCurrent(First());
SetHelpKeys(); SetHelpKeys();
@ -900,7 +902,7 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
case kOk: return Edit(); case kOk: return Edit();
case kRed: state = OnOff(); break; // must go through SetHelpKeys()! case kRed: state = OnOff(); break; // must go through SetHelpKeys()!
case kGreen: return New(); case kGreen: return New();
case kYellow: return Delete(); case kYellow: state = Delete(); break;
case kBlue: return Info(); case kBlue: return Info();
break; break;
default: break; default: break;