diff options
author | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2007-11-04 18:00:00 +0100 |
---|---|---|
committer | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2007-11-04 18:00:00 +0100 |
commit | 182cd78af06cee95594307b792b8951153c4888e (patch) | |
tree | 4b628340a8e403307a076f35a0e1fcf405762ba6 /shutdown.c | |
parent | dbf38b7c68911187b6a48688b738c31612d35984 (diff) | |
download | vdr-patch-lnbsharing-182cd78af06cee95594307b792b8951153c4888e.tar.gz vdr-patch-lnbsharing-182cd78af06cee95594307b792b8951153c4888e.tar.bz2 |
Version 1.5.11vdr-1.5.11
- Fixed checking compatibility mode for old subtitles plugin (thanks to Marco
Schlüßler).
- Updated the French OSD texts (thanks to Michael Nival).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- The "Play" key now starts replay of the selected recording in the Recordings
menu (thanks to Ville Skyttä);
- Improved shutdown handling (thanks to Udo Richter).
- Housekeeping now waits for a while after a replay has ended (thanks to Udo Richter).
- Added more special characters to the list of allowed characters when entering
strings (thanks to Thomas Günther).
- Added Ukrainian language texts (thanks to Yarema Aka Knedlyk).
- Added a workaround for recovering from wrongfully interpreted "pre 1.3.19 PS1 packets".
- Fixed a possible blocking in replay when subtitles are active.
- Fixed displaying subtitles in live mode.
- Fixed handling CONFDIR (thanks to Rolf Ahrenberg).
- Added some missing 'const' keywords (thanks to Sascha Volkenandt).
- The 'Allowed' parameter in cMenuEditStrItem() is now NULL by default, which results
in using tr(FileNameChars) (suggested by Thomas Günther).
- Added a missing '.' to the date returned by DayDateTime() (thanks to Lauri Nurmi).
- Improved the 'i18n' target in the Makefile to avoid unnecessary work (thanks to
Stefan Huelswitt). The 'newplugin' and 'i18n-to-gettext.pl' scripts have been
changed accordingly. Plugin authors may want to adjust the 'i18n' target
of their Makefiles.
- Fixed a crash if no fonts are found (thanks to Mario Ivankovits and Clemens
Kirchgatterer).
- Fixed decoding filename characters in case there are not two hex digits after
the '#' (reported by Helmut Auer).
Diffstat (limited to 'shutdown.c')
-rw-r--r-- | shutdown.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -6,7 +6,7 @@ * * Original version written by Udo Richter <udo_richter@gmx.de>. * - * $Id: shutdown.c 1.1 2007/02/24 17:24:11 kls Exp $ + * $Id: shutdown.c 1.2 2007/10/19 14:33:40 kls Exp $ */ #include "shutdown.h" @@ -110,9 +110,11 @@ void cShutdownHandler::CheckManualStart(int ManualStart) // Set inactive after MinUserInactivity SetUserInactiveTimeout(); } - else + else { // Set inactive from now on + dsyslog("scheduled wakeup time in %ld minutes, assuming automatic start of VDR", Delta / 60); SetUserInactive(); + } } void cShutdownHandler::SetShutdownCommand(const char *ShutdownCommand) @@ -126,8 +128,13 @@ void cShutdownHandler::CallShutdownCommand(time_t WakeupTime, int Channel, const time_t Delta = WakeupTime ? WakeupTime - time(NULL) : 0; cString cmd = cString::sprintf("%s %ld %ld %d \"%s\" %d", shutdownCommand, WakeupTime, Delta, Channel, *strescape(File, "\"$"), UserShutdown); isyslog("executing '%s'", *cmd); - if (SystemExec(cmd, true) == 0) + int Status = SystemExec(cmd, true); + if (!WIFEXITED(Status) || WEXITSTATUS(Status)) + esyslog("SystemExec() failed with status %d", Status); + else { Setup.NextWakeupTime = WakeupTime; // Remember this wakeup time for comparison on reboot + Setup.Save(); + } } void cShutdownHandler::SetUserInactiveTimeout(int Seconds, bool Force) |