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

Fixed handling the color buttons in the "Edit channel" menu

This commit is contained in:
Klaus Schmidinger 2003-07-26 10:09:38 +02:00
parent 734941a285
commit 1ea8f44953
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -731,3 +731,4 @@ Thomas Keil <tk@commedia-group.com>
for suggesting to change the behaviour of the '0' key in normal viewing mode so for suggesting to change the behaviour of the '0' key in normal viewing mode so
that a channel only qualifies as "previous" if it has been selected for at least that a channel only qualifies as "previous" if it has been selected for at least
3 seconds 3 seconds
for reporting a bug in handling the color buttons in the "Edit channel" menu

4
HISTORY
View File

@ -2254,7 +2254,7 @@ Video Disk Recorder Revision History
- Some corrections to the Finnish OSD texts (thanks to Niko Tarnanen and Rolf - Some corrections to the Finnish OSD texts (thanks to Niko Tarnanen and Rolf
Ahrenberg). Ahrenberg).
2003-07-13: Version 1.2.2 2003-07-26: Version 1.2.2
- Fixed a bug in channel switching after Left/Right has been pressed (thanks to - Fixed a bug in channel switching after Left/Right has been pressed (thanks to
Michael Walle for reporting this one). Michael Walle for reporting this one).
@ -2269,3 +2269,5 @@ Video Disk Recorder Revision History
- Now clearing the channel info display when entering numeric keys to switch - Now clearing the channel info display when entering numeric keys to switch
channels (suggested by Guy Roussin). channels (suggested by Guy Roussin).
- Added missing I18N entry for "Ppid" (thanks to Rolf Ahrenberg). - Added missing I18N entry for "Ppid" (thanks to Rolf Ahrenberg).
- Fixed handling the color buttons in the "Edit channel" menu (thanks to Thomas
Keil for reporting this one).

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.260 2003/06/19 10:09:29 kls Exp $ * $Id: menu.c 1.261 2003/07/26 10:05:20 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -713,6 +713,8 @@ void cMenuChannels::Propagate(void)
eOSState cMenuChannels::Switch(void) eOSState cMenuChannels::Switch(void)
{ {
if (HasSubMenu())
return osContinue;
cChannel *ch = GetChannel(Current()); cChannel *ch = GetChannel(Current());
if (ch) if (ch)
cDevice::PrimaryDevice()->SwitchChannel(ch, true); cDevice::PrimaryDevice()->SwitchChannel(ch, true);
@ -738,7 +740,7 @@ eOSState cMenuChannels::New(void)
eOSState cMenuChannels::Delete(void) eOSState cMenuChannels::Delete(void)
{ {
if (Count() > 0) { if (!HasSubMenu() && Count() > 0) {
int Index = Current(); int Index = Current();
cChannel *channel = GetChannel(Current()); cChannel *channel = GetChannel(Current());
int DeletedChannel = channel->Number(); int DeletedChannel = channel->Number();
@ -793,7 +795,9 @@ eOSState cMenuChannels::ProcessKey(eKeys Key)
case kRed: return Edit(); case kRed: return Edit();
case kGreen: return New(); case kGreen: return New();
case kYellow: return Delete(); case kYellow: return Delete();
case kBlue: Mark(); break; case kBlue: if (!HasSubMenu())
Mark();
break;
default: break; default: break;
} }
} }