summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-12-02 16:22:12 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2006-12-02 16:22:12 +0100
commit3f7090887b8ddcbb9d641813241d32102f9f4515 (patch)
tree7c26a1ce403fb31f2e93ffcd7aa4079ab7b70f80
parent19f39258f0b3131345c1b0b3aa1a5c03f88bc33a (diff)
downloadvdr-3f7090887b8ddcbb9d641813241d32102f9f4515.tar.gz
vdr-3f7090887b8ddcbb9d641813241d32102f9f4515.tar.bz2
Moved the cPluginManager::Active() call further down
-rw-r--r--vdr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/vdr.c b/vdr.c
index d3ecc31a..a628cd01 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.281 2006/12/02 10:33:35 kls Exp $
+ * $Id: vdr.c 1.282 2006/12/02 16:22:12 kls Exp $
*/
#include <getopt.h>
@@ -1159,10 +1159,6 @@ int main(int argc, char *argv[])
if (Now - LastActivity > ACTIVITYTIMEOUT) {
// Shutdown:
if (Shutdown && (Setup.MinUserInactivity || LastActivity == 1) && Now - LastActivity > Setup.MinUserInactivity * 60) {
- if (!ForceShutdown && cPluginManager::Active()) {
- LastActivity = Now - Setup.MinUserInactivity * 60 + SHUTDOWNRETRY; // try again later
- continue;
- }
cTimer *timer = Timers.GetNextActiveTimer();
time_t Next = timer ? timer->StartTime() : 0;
time_t Delta = timer ? Next - Now : 0;
@@ -1182,6 +1178,10 @@ int main(int argc, char *argv[])
timer = NULL;
dsyslog("reboot at %s", *TimeToString(Next));
}
+ if (!ForceShutdown && cPluginManager::Active()) {
+ LastActivity = Now - Setup.MinUserInactivity * 60 + SHUTDOWNRETRY; // try again later
+ continue;
+ }
if (!Next || Delta > Setup.MinEventTimeout * 60 || ForceShutdown) {
ForceShutdown = false;
if (timer)