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

Fixed handling user activity for shutdown

This commit is contained in:
Klaus Schmidinger 2007-03-10 13:02:05 +01:00
parent df2f3335eb
commit 93ad92da14
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -5139,6 +5139,8 @@ Video Disk Recorder Revision History
parameter to 0 turns off the automatic channel switching, and the user will
have to confirm the entry by pressing the "Ok" key.
2007-03-03: Version 1.5.2
2007-03-10: Version 1.5.2
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
- Fixed handling user activity for shutdown, which I had messed when adopting Udo's
original patch (thanks to Udo Richter).

4
vdr.c
View File

@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
* $Id: vdr.c 1.285 2007/02/25 11:27:36 kls Exp $
* $Id: vdr.c 1.286 2007/03/10 13:00:22 kls Exp $
*/
#include <getopt.h>
@ -1162,7 +1162,7 @@ int main(int argc, char *argv[])
ShutdownHandler.countdown.Cancel();
}
if (!Interact && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && cRemote::LastActivity() > ACTIVITYTIMEOUT) {
if (!Interact && !cRecordControls::Active() && !cCutter::Active() && !Interface->HasSVDRPConnection() && (time(NULL) - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
// Handle housekeeping tasks
// Shutdown: