summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-05-14 11:22:13 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2006-05-14 11:22:13 +0200
commitf9b0db06106ff2a26614ac48e308f16d98fa5d75 (patch)
tree19d16d8f0907b5459b40db92f726425435d395bc /vdr.c
parent6d670724e09dbec994f830435667c476db766923 (diff)
downloadvdr-f9b0db06106ff2a26614ac48e308f16d98fa5d75.tar.gz
vdr-f9b0db06106ff2a26614ac48e308f16d98fa5d75.tar.bz2
Fixed automatically updating the CAM menu in case the whole operation takes longer than the menu timeout1.4.0-1
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/vdr.c b/vdr.c
index 6f4a9725..6343933f 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.271 2006/05/13 09:10:56 kls Exp $
+ * $Id: vdr.c 1.272 2006/05/14 09:23:46 kls Exp $
*/
#include <getopt.h>
@@ -1032,6 +1032,9 @@ int main(int argc, char *argv[])
else if (time(NULL) - LastActivity > MENUTIMEOUT)
state = osEnd;
}
+ // TODO make the CAM menu stay open in case of automatic updates and have it return osContinue; then the following two lines can be removed again
+ else if (state == osEnd && LastActivity > 1)
+ LastActivity = time(NULL);
switch (state) {
case osPause: DELETE_MENU;
cControl::Shutdown(); // just in case