summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-11-03 11:49:39 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2001-11-03 11:49:39 +0100
commit62c452561e183ee6257aa14943e9c008650430df (patch)
tree5f6a8157cdd24b80fa4269d7a9fdb0fc13bcbf72
parentd78d555b271078c10c2d2ad9b7f47d326f9bab8c (diff)
downloadvdr-62c452561e183ee6257aa14943e9c008650430df.tar.gz
vdr-62c452561e183ee6257aa14943e9c008650430df.tar.bz2
Fixed handling the 'Power' key in case Setup.MinUserInactivity is set to 0
-rw-r--r--HISTORY2
-rw-r--r--vdr.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 3313a62a..e5a02ede 100644
--- a/HISTORY
+++ b/HISTORY
@@ -854,3 +854,5 @@ Video Disk Recorder Revision History
- Added PTS to the converted PCM audio when replaying a DVD (thanks to Andreas
Schultz). Now the audio and video of a DVD replayed over the DVB card's A/V
out should always be in sync.
+- Fixed handling the "Power" key in case Setup.MinUserInactivity is set to 0 to
+ disable automatic shutdown.
diff --git a/vdr.c b/vdr.c
index 287fe64f..c62a2856 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/people/kls/vdr
*
- * $Id: vdr.c 1.87 2001/10/27 09:47:02 kls Exp $
+ * $Id: vdr.c 1.88 2001/11/03 11:48:21 kls Exp $
*/
#include <getopt.h>
@@ -483,7 +483,7 @@ int main(int argc, char *argv[])
time_t Now = time(NULL);
if (Now - LastActivity > ACTIVITYTIMEOUT) {
// Shutdown:
- if (Shutdown && Setup.MinUserInactivity && Now - LastActivity > Setup.MinUserInactivity * 60) {
+ if (Shutdown && (Setup.MinUserInactivity || LastActivity == 1) && Now - LastActivity > Setup.MinUserInactivity * 60) {
cTimer *timer = Timers.GetNextActiveTimer();
time_t Next = timer ? timer->StartTime() : 0;
time_t Delta = timer ? Next - Now : 0;