From fc4c8740a72e6c7cea5a001e19fdacb63c3cc538 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 13 Jan 2008 18:00:00 +0100
Subject: =?UTF-8?q?Version=201.5.13=20-=20Fixed=20the=20declaration=20of?=
 =?UTF-8?q?=20cSubtitleObject::Decode8BppCodeString()=20(thanks=20to=20=20?=
 =?UTF-8?q?=20Gregoire=20Favre).=20-=20The=20new=20setup=20option=20"Misce?=
 =?UTF-8?q?llaneous/Emergency=20exit"=20can=20be=20used=20to=20turn=20off?=
 =?UTF-8?q?=20=20=20the=20automatic=20restart=20of=20VDR=20in=20case=20a?=
 =?UTF-8?q?=20recording=20fails=20for=20some=20reason.=20-=20The=20kInfo?=
 =?UTF-8?q?=20key=20is=20now=20propagated=20to=20any=20open=20menu,=20so?=
 =?UTF-8?q?=20that=20it=20can=20react=20to=20it=20=20=20in=20a=20context?=
 =?UTF-8?q?=20sensitive=20manner=20(suggested=20by=20Andreas=20Brugger).?=
 =?UTF-8?q?=20If=20there=20is=20=20=20no=20menu=20open=20it=20will=20show?=
 =?UTF-8?q?=20the=20info=20of=20the=20current=20broadcast=20or=20replay.?=
 =?UTF-8?q?=20-=20cTimeMs=20now=20uses=20the=20monotonic=20clock,=20if=20a?=
 =?UTF-8?q?vailable=20(thanks=20to=20Petri=20Hintukainen).=20-=20Fixed=20c?=
 =?UTF-8?q?Vector::Clear()=20and=20cStringList::Clear().=20-=20Added=20cSt?=
 =?UTF-8?q?ring::Truncate().=20-=20Fixed=20the=20"i18n:"=20target=20in=20t?=
 =?UTF-8?q?he=20"newplugin"=20script,=20so=20that=20it=20can=20create=20th?=
 =?UTF-8?q?e=20=20=20initial=20*.pot=20file.=20-=20Fixed=20handling=20the?=
 =?UTF-8?q?=20'-l'=20option.=20-=20Fixed=20error=20handling=20in=20cCuttin?=
 =?UTF-8?q?gThread::Action()=20(thanks=20to=20Udo=20Richter).=20-=20Fixed?=
 =?UTF-8?q?=20a=20loss=20of=20the=20date=20display=20in=20the=20"classic"?=
 =?UTF-8?q?=20skin's=20main=20menu=20(reported=20by=20=20=20Andreas=20Brug?=
 =?UTF-8?q?ger).=20-=20Added=20a=20missing=20setting=20of=20lastFreeMB=20i?=
 =?UTF-8?q?n=20cMenuMain::Update()=20(reported=20by=20=20=20Andreas=20Brug?=
 =?UTF-8?q?ger).=20-=20Added=20'-Wno-parentheses'=20to=20the=20compiler=20?=
 =?UTF-8?q?options=20in=20order=20to=20avoid=20silly=20compiler=20=20=20wa?=
 =?UTF-8?q?rnings=20for=20expressions=20like=20'a=20||=20b=20&&=20c',=20wh?=
 =?UTF-8?q?ere=20GCC=204.3=20wants=20to=20force=20the=20=20=20programmer?=
 =?UTF-8?q?=20to=20write=20'a=20||=20(b=20&&=20c)',=20while=20everybody=20?=
 =?UTF-8?q?knows=20that=20'&&'=20links=20=20=20stronger=20than=20'||'=20(r?=
 =?UTF-8?q?eported=20by=20Tobias=20Grimm).=20-=20Updated=20the=20Hungarian?=
 =?UTF-8?q?=20language=20texts=20(thanks=20to=20Istv=C3=A1n=20F=C3=BCley).?=
 =?UTF-8?q?=20-=20Fixed=20displaying=20weekday=20names=20in=20the=20Schedu?=
 =?UTF-8?q?le=20menu=20if=20the=20system=20uses=20UTF-8=20=20=20(reported?=
 =?UTF-8?q?=20by=20Jiri=20Dobry).=20-=20The=20new=20plugin=20"pictures"=20?=
 =?UTF-8?q?implements=20a=20simple=20picture=20viewer.=20=20=20See=20PLUGI?=
 =?UTF-8?q?NS/src/pictures/README=20for=20details.=20-=20The=20automatic?=
 =?UTF-8?q?=20shutdown=20is=20now=20suppressed=20if=20the=20remote=20contr?=
 =?UTF-8?q?ol=20is=20currently=20=20=20disabled=20(suggested=20by=20Helmut?=
 =?UTF-8?q?=20Auer,=20implemented=20by=20Udo=20Richter).=20-=20Added=20a?=
 =?UTF-8?q?=20section=20about=20"Logging"=20to=20PLUGINS.html=20(suggested?=
 =?UTF-8?q?=20by=20Torsten=20Kunkel).=20-=20Enhanced=20the=20SVDRP=20comma?=
 =?UTF-8?q?nd=20CLRE=20to=20allow=20clearing=20the=20EPG=20data=20of=20a?=
 =?UTF-8?q?=20particular=20=20=20channel=20(thanks=20to=20Benjamin=20Hess)?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shutdown.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'shutdown.c')

diff --git a/shutdown.c b/shutdown.c
index 4fde544..ea137ed 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.2 2007/10/19 14:33:40 kls Exp $
+ * $Id: shutdown.c 1.4 2008/01/13 14:27:29 kls Exp $
  */
 
 #include "shutdown.h"
@@ -95,9 +95,13 @@ cShutdownHandler::~cShutdownHandler()
 
 void cShutdownHandler::RequestEmergencyExit(void)
 {
-  esyslog("initiating emergency exit");
-  emergencyExitRequested = true;
-  Exit(1);
+  if (Setup.EmergencyExit) {
+     esyslog("initiating emergency exit");
+     emergencyExitRequested = true;
+     Exit(1);
+     }
+  else
+     dsyslog("emergency exit request ignored according to setup");
 }
 
 void cShutdownHandler::CheckManualStart(int ManualStart)
@@ -150,6 +154,9 @@ void cShutdownHandler::SetUserInactiveTimeout(int Seconds, bool Force)
 
 bool cShutdownHandler::ConfirmShutdown(bool Interactive)
 {
+  if (!Interactive && !cRemote::Enabled())
+     return false;
+
   if (!shutdownCommand) {
      if (Interactive)
         Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
-- 
cgit v1.2.3