From 287cd613a1d5d08fb56e107460473132d23e3ca0 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <kls (at) cadsoft (dot) de>
Date: Sun, 3 Dec 2006 18:00:00 +0100
Subject: =?UTF-8?q?Version=201.4.4-1=20-=20Some=20improvements=20to=20the?=
 =?UTF-8?q?=20man=20pages=20(thanks=20to=20Ville=20Skytt=C3=A4).=20-=20Fix?=
 =?UTF-8?q?ed=20a=20possible=20segfault=20in=20cSkins::Message()=20(thanks?=
 =?UTF-8?q?=20to=20Udo=20Richter).=20-=20Made=20the=20getskyepg.pl=20scrip?=
 =?UTF-8?q?t=20of=20the=20'sky'=20plugin=20send=20a=20user=20agent=20messa?=
 =?UTF-8?q?ge=20to=20=20=20the=20server,=20according=20to=20the=20rules=20?=
 =?UTF-8?q?at=20http://bleb.org/tv/data/listings.=20=20=20If=20your=20vers?=
 =?UTF-8?q?ion=20of=20'wget'=20doesn't=20support=20the=20-U=20option=20to?=
 =?UTF-8?q?=20set=20the=20user=20agent,=20=20=20use=20the=20new=20option?=
 =?UTF-8?q?=20-U=20of=20getskyepg.pl=20to=20have=20the=20information=20add?=
 =?UTF-8?q?ed=20to=20the=20URL=20=20=20as=20a=20query=20string.=20-=20The?=
 =?UTF-8?q?=20getskyepg.pl=20script=20now=20replaces=20"&amp;"=20with=20"&?=
 =?UTF-8?q?".=20-=20Fixed=20a=20possible=20crash=20in=20remux.c=20on=2064-?=
 =?UTF-8?q?bit=20machines=20(thanks=20to=20Reinhard=20Nissl).=20-=20Fixed?=
 =?UTF-8?q?=20a=20typo=20in=20the=20change=20to=20the=20"Use=20small=20fon?=
 =?UTF-8?q?t"=20setup=20option=20in=20version=201.3.47=20=20=20in=20the=20?=
 =?UTF-8?q?HISTORY=20and=20CONTRIBUTORS=20file=20(reported=20by=20Andreas?=
 =?UTF-8?q?=20Brugger).=20-=20Added=20a=20missing=20'const'=20to=20cRecord?=
 =?UTF-8?q?ingInfo::ChannelID()=20(reported=20by=20Andreas=20=20=20Brugger?=
 =?UTF-8?q?).=20This=20required=20the=20APIVERSION=20to=20be=20increased,?=
 =?UTF-8?q?=20so=20plugins=20will=20have=20to=20=20=20be=20recompiled.=20-?=
 =?UTF-8?q?=20Now=20calling=20cPluginManager::Active()=20only=20if=20VDR?=
 =?UTF-8?q?=20is=20really=20trying=20to=20shut=20down,=20=20=20and=20waiti?=
 =?UTF-8?q?ng=20for=205=20minutes=20before=20calling=20it=20again=20(thank?=
 =?UTF-8?q?s=20to=20J=C3=B6rg=20Wendel=20for=20=20=20reporting=20that=20cP?=
 =?UTF-8?q?lugin::Active()=20was=20called=20too=20often,=20and=20to=20Udo?=
 =?UTF-8?q?=20Richter=20for=20=20=20some=20hints=20on=20how=20to=20improve?=
 =?UTF-8?q?=20this).=20-=20Replaced=20'unsigned=20long'=20with=20'uint32?=
 =?UTF-8?q?=5Ft'=20and=20'uint64'=20with=20'uint64=5Ft'=20to=20=20=20avoid?=
 =?UTF-8?q?=20problems=20on=2064-bit=20machines.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skins.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'skins.c')

diff --git a/skins.c b/skins.c
index 7a9682e..34b2638 100644
--- a/skins.c
+++ b/skins.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: skins.c 1.11 2006/06/03 14:39:14 kls Exp $
+ * $Id: skins.c 1.12 2006/12/01 13:32:37 kls Exp $
  */
 
 #include "skins.h"
@@ -226,8 +226,11 @@ eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
     }
   if (!Current())
      return kNone;
-  if (!cSkinDisplay::Current() && !displayMessage)
+  if (!cSkinDisplay::Current()) {
+     if (displayMessage)
+        delete displayMessage;
      displayMessage = Current()->DisplayMessage();
+     }
   cSkinDisplay::Current()->SetMessage(Type, s);
   cSkinDisplay::Current()->Flush();
   cStatus::MsgOsdStatusMessage(s);
-- 
cgit v1.2.3