summaryrefslogtreecommitdiff
path: root/menu.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-02-03 15:32:47 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2001-02-03 15:32:47 +0100
commit4041359317be487ab31e058c10c9f62ec38fbc04 (patch)
tree2e93bbc8faab878fa3e31dda515e227411c1a2cf /menu.c
parent7f6a2a7a0c001c425efdab381914e7c297f61166 (diff)
downloadvdr-4041359317be487ab31e058c10c9f62ec38fbc04.tar.gz
vdr-4041359317be487ab31e058c10c9f62ec38fbc04.tar.bz2
Implemented page up/down with 'Left'/'Right' (cont'd)
Diffstat (limited to 'menu.c')
-rw-r--r--menu.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/menu.c b/menu.c
index 027c4661..beae81cb 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.60 2001/02/03 15:28:49 kls Exp $
+ * $Id: menu.c 1.61 2001/02/03 15:32:47 kls Exp $
*/
#include "menu.h"
@@ -1076,16 +1076,20 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
{
// Must do these before calling cOsdMenu::ProcessKey() because cOsdMenu
// uses them to page up/down:
- switch (Key) {
- case kLeft:
- case kRight: return Activate(Key == kRight);
- default: break;
- }
+ if (!HasSubMenu()) {
+ switch (Key) {
+ case kLeft:
+ case kRight: return Activate(Key == kRight);
+ default: break;
+ }
+ }
eOSState state = cOsdMenu::ProcessKey(Key);
if (state == osUnknown) {
switch (Key) {
+ case kLeft:
+ case kRight: return Activate(Key == kRight);
case kOk: return Summary();
case kRed: return Edit();
case kGreen: return New();