summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2019-03-12 10:01:16 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2019-03-12 10:01:16 +0100
commit235c65264801e950aa481dc6b3f78f112a64f1c6 (patch)
tree4b7b2b4234d536de491c580e815243b808405320
parent61c00ccae5d2913c32c075314b7b588b5880d7eb (diff)
downloadvdr-235c65264801e950aa481dc6b3f78f112a64f1c6.tar.gz
vdr-235c65264801e950aa481dc6b3f78f112a64f1c6.tar.bz2
Fixed shutdown after user inactivity in case a plugin is keeping the OSD open (cont'd)
-rw-r--r--vdr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vdr.c b/vdr.c
index 1f9684e1..140f7501 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.27 2018/07/16 08:52:40 kls Exp $
+ * $Id: vdr.c 4.28 2019/03/12 10:01:16 kls Exp $
*/
#include <getopt.h>
@@ -1514,7 +1514,7 @@ int main(int argc, char *argv[])
ShutdownHandler.countdown.Cancel();
}
- if (!cRecordControls::Active() && !RecordingsHandler.Active() && (Now - cRemote::LastActivity()) > ACTIVITYTIMEOUT) {
+ if (!cControl::Control() && !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;