diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2001-10-20 11:23:27 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2001-10-20 11:23:27 +0200 |
commit | e3c09115fe66a8146f742807915144eafc6b8fd5 (patch) | |
tree | 78472a080f9306ec3cca7c3a5538be7fc3a80af1 /menu.c | |
parent | 60ee85bf172c43a4104203b6dfacb3353e606e48 (diff) | |
download | vdr-e3c09115fe66a8146f742807915144eafc6b8fd5.tar.gz vdr-e3c09115fe66a8146f742807915144eafc6b8fd5.tar.bz2 |
The menu timeout now also works when pressing the 'Back' button during replay to enter the 'Recordings' menu
Diffstat (limited to 'menu.c')
-rw-r--r-- | menu.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 1.129 2001/10/20 09:04:28 kls Exp $ + * $Id: menu.c 1.130 2001/10/20 11:16:56 kls Exp $ */ #include "menu.h" @@ -1808,7 +1808,7 @@ eOSState cMenuCommands::ProcessKey(eKeys Key) #define STOP_RECORDING tr(" Stop recording ") -cMenuMain::cMenuMain(bool Replaying) +cMenuMain::cMenuMain(bool Replaying, eOSState State) :cOsdMenu(tr("Main")) { digit = 0; @@ -1844,6 +1844,13 @@ cMenuMain::cMenuMain(bool Replaying) Display(); lastActivity = time(NULL); SetHasHotkeys(); + switch (State) { + case osRecordings: AddSubMenu(new cMenuRecordings); break; +#ifdef DVDSUPPORT + case osDVD: AddSubMenu(new cMenuDVD); break; +#endif //DVDSUPPORT + default: break; + } } const char *cMenuMain::hk(const char *s) |