From 9c4401f5d96efdcbab5c504b894f7735e869079e Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 14 Aug 2005 15:03:31 +0200 Subject: [PATCH] Now discarding any previous numerical input to switch channels if Up, Down, Channel+, Channel-, Left or Right is pressed --- CONTRIBUTORS | 2 ++ HISTORY | 3 +++ menu.c | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 007e13e3..34e4c81f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1347,6 +1347,8 @@ Wolfgang Rohdewald cEvent::FixEpgBugs() for adding a missing cMutexLock to cRemote::HasKeys() for removing an unnecessary #include from osd.c + for reporting a problem with with numerical input to switch channels if Up, Down, + Channel+ or Channel- is pressed Chad Flynt for suggestions and experiments regarding the buffer reserve in cTransfer diff --git a/HISTORY b/HISTORY index f7542002..050ac1f1 100644 --- a/HISTORY +++ b/HISTORY @@ -3689,3 +3689,6 @@ Video Disk Recorder Revision History - Changed the title of the recording info menu (thanks to Rolf Ahrenberg). - Fixed handling the frame number display if '7' is pressed before the first editing mark, or '9' after the last one (thanks to Thomas Günther). +- Now discarding any previous numerical input to switch channels if Up, Down, Channel+, + Channel-, Left or Right is pressed (thanks to Wolfgang Rohdewald for reporting a + problem with this). diff --git a/menu.c b/menu.c index fa541909..8b9e4c4d 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.353 2005/08/14 12:57:48 kls Exp $ + * $Id: menu.c 1.354 2005/08/14 15:00:11 kls Exp $ */ #include "menu.h" @@ -2789,6 +2789,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key) case kRight|k_Repeat: case kRight: withInfo = false; + number = 0; if (group < 0) { cChannel *channel = Channels.GetByNumber(cDevice::CurrentChannel()); if (channel) @@ -2824,6 +2825,7 @@ eOSState cDisplayChannel::ProcessKey(eKeys Key) case kChanDn: withInfo = true; group = -1; + number = 0; Refresh(); break; case kNone: