From 235c65264801e950aa481dc6b3f78f112a64f1c6 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Tue, 12 Mar 2019 10:01:16 +0100 Subject: [PATCH] Fixed shutdown after user inactivity in case a plugin is keeping the OSD open (cont'd) --- vdr.c | 4 ++-- 1 file 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 @@ -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;