frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed shutdown after user inactivity in case a plugin is keeping the OSD open (cont'd)

This commit is contained in:
Klaus Schmidinger 2019-03-12 10:01:16 +01:00
parent 61c00ccae5
commit 235c652648
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vdr.c
View File

@ -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;