diff options
-rw-r--r-- | HISTORY | 3 | ||||
-rw-r--r-- | menu.c | 10 |
2 files changed, 10 insertions, 3 deletions
@@ -768,4 +768,5 @@ Video Disk Recorder Revision History no more replay mode display when pressing the "Green" or "Yellow" button (Skip +/-60s); fixed timeout when pressing '0' to set an editing mark while the progress display is not shown; mode display is shown after progress - display is closed; + display is closed; pressing "Ok" while the mode display is on brings up + the progress display; @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 1.123 2001/09/21 16:03:48 kls Exp $ + * $Id: menu.c 1.124 2001/09/21 16:16:47 kls Exp $ */ #include "menu.h" @@ -2386,6 +2386,8 @@ void cReplayControl::ClearLastReplayed(const char *FileName) void cReplayControl::Show(int Seconds) { + if (modeOnly) + Hide(); if (!visible) { shown = ShowProgress(true); timeoutShow = (shown && Seconds > 0) ? time(NULL) + Seconds : 0; @@ -2725,7 +2727,11 @@ eOSState cReplayControl::ProcessKey(eKeys Key) switch (Key) { // Menu control: case kMenu: Hide(); return osMenu; // allow direct switching to menu - case kOk: visible ? Hide() : Show(); break; + case kOk: if (visible && !modeOnly) + Hide(); + else + Show(); + break; case kBack: return osRecordings; default: return osUnknown; } |