frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed automatically updating the CAM menu in case the whole operation takes longer than the menu timeout

This commit is contained in:
Klaus Schmidinger 2006-05-14 11:22:13 +02:00
parent 6d670724e0
commit f9b0db0610
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -4688,7 +4688,7 @@ Video Disk Recorder Revision History
- Updated the Italian OSD texts (thanks to Nino Gerbino and Antonio Ospite). - Updated the Italian OSD texts (thanks to Nino Gerbino and Antonio Ospite).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov). - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
2006-05-12: Version 1.4.0-1 2006-05-14: Version 1.4.0-1
- Updated 'S110W' in 'sources.conf'. - Updated 'S110W' in 'sources.conf'.
- Adjusted the 'runvdr' script so that the user can fill in the functions to - Adjusted the 'runvdr' script so that the user can fill in the functions to
@ -4713,3 +4713,5 @@ Video Disk Recorder Revision History
- Since some channels (especially the Austrian ORF) randomly change the ids of their - Since some channels (especially the Austrian ORF) randomly change the ids of their
EPG events, VDR now gives the start time precedence when searching for existing EPG events, VDR now gives the start time precedence when searching for existing
events. events.
- Fixed automatically updating the CAM menu in case the whole operation (for
instance a firmware update) takes longer than the menu timeout.

5
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.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> #include <getopt.h>
@ -1032,6 +1032,9 @@ int main(int argc, char *argv[])
else if (time(NULL) - LastActivity > MENUTIMEOUT) else if (time(NULL) - LastActivity > MENUTIMEOUT)
state = osEnd; 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) { switch (state) {
case osPause: DELETE_MENU; case osPause: DELETE_MENU;
cControl::Shutdown(); // just in case cControl::Shutdown(); // just in case