1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed menu timeout handling while replaying

This commit is contained in:
Klaus Schmidinger 2005-09-04 08:57:15 +02:00
parent 2f4526e55e
commit c4ff05bbca

6
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * 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> #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 Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time
if (Interact) { if (Interact) {
eOSState state = Interact->ProcessKey(key); eOSState state = Interact->ProcessKey(key);
if (state == osUnknown) { if (state == osUnknown && Interact != cControl::Control()) {
if (ISMODELESSKEY(key) && cControl::Control() && Interact != cControl::Control()) if (ISMODELESSKEY(key) && cControl::Control())
state = cControl::Control()->ProcessKey(key); state = cControl::Control()->ProcessKey(key);
else if (time(NULL) - LastActivity > MENUTIMEOUT) else if (time(NULL) - LastActivity > MENUTIMEOUT)
state = osEnd; state = osEnd;