From f2d44b3d60fc8d8aad83eb5595c59c19b4d0739a Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 7 Nov 2004 09:52:21 +0100
Subject: Added a missing call to cStatus::MsgOsdStatusMessage(NULL) in
 cSkins::Message()

---
 CONTRIBUTORS | 2 ++
 HISTORY      | 3 ++-
 skins.c      | 8 +++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index edf2263c..f3d20f9e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1000,6 +1000,8 @@ Andreas Regel <andreas.regel@gmx.de>
  for fixing handling bitmap indexes for 256 color mode
  for reporting a bug in removing the "scanning recordings..." message in case the
  video directory is empty
+ for pointing out a missing call to cStatus::MsgOsdtatusMessage(NULL) in
+ cSkins::Message()
 
 Thomas Bergwinkl <Thomas.Bergwinkl@t-online.de>
  for fixing the validity check for channel IDs, because some providers use TIDs
diff --git a/HISTORY b/HISTORY
index 87f5d269..78b751a5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3125,6 +3125,7 @@ Video Disk Recorder Revision History
 - Reactivated the NPTL check at startup because there appear to be still
   unsolved problems when running on NPTL systems.
 - Added missing calls to cStatus::MsgOsdClear() in cSkins::Message() (thanks
-  to Joachim Wilke for reporting this one).
+  to Joachim Wilke for reporting this one, and Andreas Regel for additional
+  input).
 - Fixed the cDvbSpuDecoder (thanks to Marco Schlüßler).
 - Fixed handling of pmAudioOnlyBlack (thanks to Stefan Huelswitt).
diff --git a/skins.c b/skins.c
index 0129378c..5770bd4c 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.2 2004/11/06 11:25:46 kls Exp $
+ * $Id: skins.c 1.3 2004/11/07 09:46:46 kls Exp $
  */
 
 #include "skins.h"
@@ -183,10 +183,12 @@ eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
      if (displayMessage) {
         delete displayMessage;
         displayMessage = NULL;
+        cStatus::MsgOsdClear();
         }
-     else
+     else {
         cSkinDisplay::Current()->SetMessage(Type, NULL);
-     cStatus::MsgOsdClear();
+        cStatus::MsgOsdStatusMessage(NULL);
+        }
      }
   else if (!s && displayMessage) {
      delete displayMessage;
-- 
cgit v1.2.3