diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2018-07-16 08:55:15 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2018-07-16 08:55:15 +0200 |
| commit | 5543f130510fba24c369d04a515415024be331b9 (patch) | |
| tree | be2214fcadf8e9f31a7c41136de4a3f56c60d4f0 | |
| parent | 30eb01ef3792e3fb75eabc34e8258d66197ec75d (diff) | |
| download | vdr-5543f130510fba24c369d04a515415024be331b9.tar.gz vdr-5543f130510fba24c369d04a515415024be331b9.tar.bz2 | |
Fixed shutdown after user inactivity in case a plugin is keeping the OSD open
| -rw-r--r-- | CONTRIBUTORS | 4 | ||||
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | vdr.c | 22 |
3 files changed, 18 insertions, 12 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index baaae827..d62e3c47 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -3566,3 +3566,7 @@ Onur Sentürk <onur@sentek.org> Helmut Binder <cco@aon.at> for improving calculating signal strength and quality + +Ulrich Eckhardt <uli@uli-eckhardt.de> + for reporting a problem with shutdown after user inactivity in case a plugin is + keeping the OSD open @@ -9348,7 +9348,7 @@ Video Disk Recorder Revision History Senzel). - Official release. -2018-05-27: Version 2.4.1 +2018-07-16: Version 2.4.1 - Fixed handling the tfRecording flag in the SVDRP commands MODT and UPDT (reported by Johann Friedrichs). @@ -9361,3 +9361,5 @@ Video Disk Recorder Revision History (if any) implements SetMessage(). - Fixed locking the Channels list in cDisplayChannel, where the lock was still held when Flush() was called (reported by Matthias Senzel and Uwe Scheffler). +- Fixed shutdown after user inactivity in case a plugin is keeping the OSD open + (reported by Ulrich Eckhardt). @@ -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(); |