From 4041359317be487ab31e058c10c9f62ec38fbc04 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 3 Feb 2001 15:32:47 +0100 Subject: Implemented page up/down with 'Left'/'Right' (cont'd) --- menu.c | 16 ++++++++++------ 1 file 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(); -- cgit v1.2.3