summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/vdr.c b/vdr.c
index 502fd96b..1f9684e1 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.tvdr.de
*
- * $Id: vdr.c 4.26 2018/04/28 11:27:48 kls Exp $
+ * $Id: vdr.c 4.27 2018/07/16 08:52:40 kls Exp $
*/
#include <getopt.h>
@@ -1514,9 +1514,7 @@ int main(int argc, char *argv[])
ShutdownHandler.countdown.Cancel();
}
- if ((Now - LastInteract) > ACTIVITYTIMEOUT && !cRecordControls::Active() && !RecordingsHandler.Active() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
- // Handle housekeeping tasks
-
+ if (!cRecordControls::Active() && !RecordingsHandler.Active() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
// Shutdown:
// Check whether VDR will be ready for shutdown in SHUTDOWNWAIT seconds:
time_t Soon = Now + SHUTDOWNWAIT;
@@ -1535,13 +1533,15 @@ int main(int argc, char *argv[])
// Do this again a bit later:
ShutdownHandler.SetRetry(SHUTDOWNRETRY);
}
-
- // Disk housekeeping:
- RemoveDeletedRecordings();
- ListGarbageCollector.Purge();
- cSchedules::Cleanup();
- // Plugins housekeeping:
- PluginManager.Housekeeping();
+ // Handle housekeeping tasks
+ if ((Now - LastInteract) > ACTIVITYTIMEOUT) {
+ // Disk housekeeping:
+ RemoveDeletedRecordings();
+ ListGarbageCollector.Purge();
+ cSchedules::Cleanup();
+ // Plugins housekeeping:
+ PluginManager.Housekeeping();
+ }
}
ReportEpgBugFixStats();