From 182cd78af06cee95594307b792b8951153c4888e Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 4 Nov 2007 18:00:00 +0100
Subject: =?UTF-8?q?Version=201.5.11=20-=20Fixed=20checking=20compatibility?=
 =?UTF-8?q?=20mode=20for=20old=20subtitles=20plugin=20(thanks=20to=20Marco?=
 =?UTF-8?q?=20=20=20Schl=C3=BC=C3=9Fler).=20-=20Updated=20the=20French=20O?=
 =?UTF-8?q?SD=20texts=20(thanks=20to=20Michael=20Nival).=20-=20Updated=20t?=
 =?UTF-8?q?he=20Estonian=20OSD=20texts=20(thanks=20to=20Arthur=20Konovalov?=
 =?UTF-8?q?).=20-=20Updated=20the=20Italian=20OSD=20texts=20(thanks=20to?=
 =?UTF-8?q?=20Diego=20Pierotto).=20-=20The=20"Play"=20key=20now=20starts?=
 =?UTF-8?q?=20replay=20of=20the=20selected=20recording=20in=20the=20Record?=
 =?UTF-8?q?ings=20=20=20menu=20(thanks=20to=20Ville=20Skytt=C3=A4);=20-=20?=
 =?UTF-8?q?Improved=20shutdown=20handling=20(thanks=20to=20Udo=20Richter).?=
 =?UTF-8?q?=20-=20Housekeeping=20now=20waits=20for=20a=20while=20after=20a?=
 =?UTF-8?q?=20replay=20has=20ended=20(thanks=20to=20Udo=20Richter).=20-=20?=
 =?UTF-8?q?Added=20more=20special=20characters=20to=20the=20list=20of=20al?=
 =?UTF-8?q?lowed=20characters=20when=20entering=20=20=20strings=20(thanks?=
 =?UTF-8?q?=20to=20Thomas=20G=C3=BCnther).=20-=20Added=20Ukrainian=20langu?=
 =?UTF-8?q?age=20texts=20(thanks=20to=20Yarema=20Aka=20Knedlyk).=20-=20Add?=
 =?UTF-8?q?ed=20a=20workaround=20for=20recovering=20from=20wrongfully=20in?=
 =?UTF-8?q?terpreted=20"pre=201.3.19=20PS1=20packets".=20-=20Fixed=20a=20p?=
 =?UTF-8?q?ossible=20blocking=20in=20replay=20when=20subtitles=20are=20act?=
 =?UTF-8?q?ive.=20-=20Fixed=20displaying=20subtitles=20in=20live=20mode.?=
 =?UTF-8?q?=20-=20Fixed=20handling=20CONFDIR=20(thanks=20to=20Rolf=20Ahren?=
 =?UTF-8?q?berg).=20-=20Added=20some=20missing=20'const'=20keywords=20(tha?=
 =?UTF-8?q?nks=20to=20Sascha=20Volkenandt).=20-=20The=20'Allowed'=20parame?=
 =?UTF-8?q?ter=20in=20cMenuEditStrItem()=20is=20now=20NULL=20by=20default,?=
 =?UTF-8?q?=20which=20results=20=20=20in=20using=20tr(FileNameChars)=20(su?=
 =?UTF-8?q?ggested=20by=20Thomas=20G=C3=BCnther).=20-=20Added=20a=20missin?=
 =?UTF-8?q?g=20'.'=20to=20the=20date=20returned=20by=20DayDateTime()=20(th?=
 =?UTF-8?q?anks=20to=20Lauri=20Nurmi).=20-=20Improved=20the=20'i18n'=20tar?=
 =?UTF-8?q?get=20in=20the=20Makefile=20to=20avoid=20unnecessary=20work=20(?=
 =?UTF-8?q?thanks=20to=20=20=20Stefan=20Huelswitt).=20The=20'newplugin'=20?=
 =?UTF-8?q?and=20'i18n-to-gettext.pl'=20scripts=20have=20been=20=20=20chan?=
 =?UTF-8?q?ged=20accordingly.=20Plugin=20authors=20may=20want=20to=20adjus?=
 =?UTF-8?q?t=20the=20'i18n'=20target=20=20=20of=20their=20Makefiles.=20-?=
 =?UTF-8?q?=20Fixed=20a=20crash=20if=20no=20fonts=20are=20found=20(thanks?=
 =?UTF-8?q?=20to=20Mario=20Ivankovits=20and=20Clemens=20=20=20Kirchgattere?=
 =?UTF-8?q?r).=20-=20Fixed=20decoding=20filename=20characters=20in=20case?=
 =?UTF-8?q?=20there=20are=20not=20two=20hex=20digits=20after=20=20=20the?=
 =?UTF-8?q?=20'#'=20(reported=20by=20Helmut=20Auer).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shutdown.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'shutdown.c')

diff --git a/shutdown.c b/shutdown.c
index 4029a78..4fde544 100644
--- a/shutdown.c
+++ b/shutdown.c
@@ -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)
-- 
cgit v1.2.3