Fixed handling user activity for shutdown

2 files changed, 5 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index 3df10b30..a7155710 100644
--- a/HISTORY
+++ b/HISTORY
@@ -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).
diff --git a/vdr.c b/vdr.c
index 001a7cb1..4dc8ec75 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.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: