frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed handling the "Red" button in the "Schedules" menu in case there are no events listed for a particular channel

This commit is contained in:
Klaus Schmidinger 2003-09-05 13:34:17 +02:00
parent 679dcebbb2
commit 8d89fb4983
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@ -791,3 +791,7 @@ Sebastian Frei <sebastian@schnapsleichen.de>
Rene Bartsch <ml@bartschnet.de> Rene Bartsch <ml@bartschnet.de>
for reporting a bug in setting the primary device in case none of the devices for reporting a bug in setting the primary device in case none of the devices
provides an MPEG decoder provides an MPEG decoder
Christoph Hermanns <christoph.hermanns@gmx.de>
for reporting a bug in handling the "Red" button in the "Schedules" menu in case
there are no events listed for a particular channel

3
HISTORY
View File

@ -2366,3 +2366,6 @@ Video Disk Recorder Revision History
this out). this out).
- Fixed setting the primary device in case none of the devices provides an MPEG - Fixed setting the primary device in case none of the devices provides an MPEG
decoder (thanks to Rene Bartsch for reporting this one). 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).

4
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.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 #ifndef __CONFIG_H
@ -19,7 +19,7 @@
#include "device.h" #include "device.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.2.5pre1" #define VDRVERSION "1.2.5pre2"
#define VDRVERSNUM 10205 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10205 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99 #define MAXPRIORITY 99

8
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.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" #include "menu.h"
@ -1250,7 +1250,7 @@ cMenuWhatsOn::cMenuWhatsOn(const cSchedules *Schedules, bool Now, int CurrentCha
currentChannel = CurrentChannelNr; currentChannel = CurrentChannelNr;
free(pArray); 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) const cEventInfo *cMenuWhatsOn::ScheduleEventInfo(void)
@ -1358,7 +1358,7 @@ cMenuSchedule::cMenuSchedule(void)
cMenuWhatsOn::SetCurrentChannel(channel->Number()); cMenuWhatsOn::SetCurrentChannel(channel->Number());
schedules = cSIProcessor::Schedules(mutexLock); schedules = cSIProcessor::Schedules(mutexLock);
PrepareSchedule(channel); 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); PrepareSchedule(channel);
if (channel->Number() != cDevice::CurrentChannel()) { if (channel->Number() != cDevice::CurrentChannel()) {
otherChannel = channel->Number(); otherChannel = channel->Number();
SetHelp(tr("Record"), tr("Now"), tr("Next"), tr("Switch")); SetHelp(Count() ? tr("Record") : NULL, tr("Now"), tr("Next"), tr("Switch"));
} }
Display(); Display();
} }