frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

The automatic shutdown is now suppressed if the remote control is currently disabled

Browse Source
This commit is contained in:
Klaus Schmidinger 2008-01-13 14:31:47 +01:00
parent 28f34ab67b
commit d39cd60ef6
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -591,6 +591,8 @@ Helmut Auer <vdr@helmutauer.de>
for a patch that was used to implement the SVDRP command REMO for a patch that was used to implement the SVDRP command REMO
for reporting a possible crash in decoding filename characters in case there are for reporting a possible crash in decoding filename characters in case there are
not two hex digits after the '#' not two hex digits after the '#'
for suggesting to suppress the automatic shutdown if the remote control is
currently disabled
Jeremy Hall <jhall@UU.NET> Jeremy Hall <jhall@UU.NET>
for fixing an incomplete initialization of the filter parameters in eit.c for fixing an incomplete initialization of the filter parameters in eit.c
@ -1549,6 +1551,7 @@ Udo Richter <udo_richter@gmx.de>
for improving shutdown handling for improving shutdown handling
for making housekeeping wait for a while after a replay has ended for making housekeeping wait for a while after a replay has ended
for fixing error handling in cCuttingThread::Action() for fixing error handling in cCuttingThread::Action()
for suppressing the automatic shutdown if the remote control is currently disabled
Sven Kreiensen <svenk@kammer.uni-hannover.de> Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date

2
HISTORY
View File

@ -5558,3 +5558,5 @@ Video Disk Recorder Revision History
(reported by Jiri Dobry). (reported by Jiri Dobry).
- The new plugin "pictures" implements a simple picture viewer. - The new plugin "pictures" implements a simple picture viewer.
See PLUGINS/src/pictures/README for details. See PLUGINS/src/pictures/README for details.
- The automatic shutdown is now suppressed if the remote control is currently
disabled (suggested by Helmut Auer, implemented by Udo Richter).

5
shutdown.c
View File

@ -6,7 +6,7 @@
* *
* Original version written by Udo Richter <udo_richter@gmx.de>. * Original version written by Udo Richter <udo_richter@gmx.de>.
* *
* $Id: shutdown.c 1.3 2007/11/25 13:49:27 kls Exp $ * $Id: shutdown.c 1.4 2008/01/13 14:27:29 kls Exp $
*/ */
#include "shutdown.h" #include "shutdown.h"
@ -154,6 +154,9 @@ void cShutdownHandler::SetUserInactiveTimeout(int Seconds, bool Force)
bool cShutdownHandler::ConfirmShutdown(bool Interactive) bool cShutdownHandler::ConfirmShutdown(bool Interactive)
{ {
if (!Interactive && !cRemote::Enabled())
return false;
if (!shutdownCommand) { if (!shutdownCommand) {
if (Interactive) if (Interactive)
Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!")); Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));