diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c1515ec0..709386c4 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -791,3 +791,7 @@ Sebastian Frei Rene Bartsch for reporting a bug in setting the primary device in case none of the devices provides an MPEG decoder + +Christoph Hermanns + for reporting a bug in handling the "Red" button in the "Schedules" menu in case + there are no events listed for a particular channel diff --git a/HISTORY b/HISTORY index 03f6aeb0..2d181157 100644 --- a/HISTORY +++ b/HISTORY @@ -2366,3 +2366,6 @@ Video Disk Recorder Revision History this out). - Fixed setting the primary device in case none of the devices provides an MPEG decoder (thanks to Rene Bartsch for reporting this one). +- Fixed handling the "Red" button in the "Schedules" menu in case there are no + events listed for a particular channel (thanks to Christoph Hermanns for + reporting this one). diff --git a/config.h b/config.h index 7463aea4..b65b2657 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.170 2003/08/30 08:39:37 kls Exp $ + * $Id: config.h 1.171 2003/09/05 13:18:38 kls Exp $ */ #ifndef __CONFIG_H @@ -19,7 +19,7 @@ #include "device.h" #include "tools.h" -#define VDRVERSION "1.2.5pre1" +#define VDRVERSION "1.2.5pre2" #define VDRVERSNUM 10205 // Version * 10000 + Major * 100 + Minor #define MAXPRIORITY 99 diff --git a/menu.c b/menu.c index 9cfd7c8f..c23c1e38 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.269 2003/08/24 14:28:44 kls Exp $ + * $Id: menu.c 1.270 2003/09/05 13:30:02 kls Exp $ */ #include "menu.h" @@ -1250,7 +1250,7 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha currentChannel = CurrentChannelNr; free(pArray); - SetHelp(tr("Record"), Now ? tr("Next") : tr("Now"), tr("Button$Schedule"), tr("Switch")); + SetHelp(Count() ? tr("Record") : NULL, Now ? tr("Next") : tr("Now"), tr("Button$Schedule"), tr("Switch")); } const cEventInfo *cMenuWhatsOn::ScheduleEventInfo(void) @@ -1358,7 +1358,7 @@ cMenuSchedule::cMenuSchedule(void) cMenuWhatsOn::SetCurrentChannel(channel->Number()); schedules = cSIProcessor::Schedules(mutexLock); PrepareSchedule(channel); - SetHelp(tr("Record"), tr("Now"), tr("Next")); + SetHelp(Count() ? tr("Record") : NULL, tr("Now"), tr("Next")); } } @@ -1470,7 +1470,7 @@ eOSState cMenuSchedule::ProcessKey(eKeys Key) PrepareSchedule(channel); if (channel->Number() != cDevice::CurrentChannel()) { otherChannel = channel->Number(); - SetHelp(tr("Record"), tr("Now"), tr("Next"), tr("Switch")); + SetHelp(Count() ? tr("Record") : NULL, tr("Now"), tr("Next"), tr("Switch")); } Display(); }