summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-09-04 08:57:15 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2005-09-04 08:57:15 +0200
commitc4ff05bbcaf8dd31ac88bdc76f2815da25ac08b0 (patch)
treef46fe794a32f8af5673f924767222b6d611bd9b6 /vdr.c
parent2f4526e55ec1bdf3ff0e2a71411cb2ae3bed6f5c (diff)
downloadvdr-c4ff05bbcaf8dd31ac88bdc76f2815da25ac08b0.tar.gz
vdr-c4ff05bbcaf8dd31ac88bdc76f2815da25ac08b0.tar.bz2
Fixed menu timeout handling while replaying
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vdr.c b/vdr.c
index 4375ec77..0e0e4288 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.215 2005/09/03 13:21:32 kls Exp $
+ * $Id: vdr.c 1.216 2005/09/04 08:57:15 kls Exp $
*/
#include <getopt.h>
@@ -818,8 +818,8 @@ int main(int argc, char *argv[])
Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time
if (Interact) {
eOSState state = Interact->ProcessKey(key);
- if (state == osUnknown) {
- if (ISMODELESSKEY(key) && cControl::Control() && Interact != cControl::Control())
+ if (state == osUnknown && Interact != cControl::Control()) {
+ if (ISMODELESSKEY(key) && cControl::Control())
state = cControl::Control()->ProcessKey(key);
else if (time(NULL) - LastActivity > MENUTIMEOUT)
state = osEnd;