summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-11-06 11:27:06 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2004-11-06 11:27:06 +0100
commit0e79c2d76ede6225b8d51625e4d55fd1fbd78680 (patch)
tree6d469b8abacabfa019a9525c6f3f45d9d1af4fd0
parent263c3c01a277b7a9519b621dfde23fbc5a8bfc56 (diff)
downloadvdr-0e79c2d76ede6225b8d51625e4d55fd1fbd78680.tar.gz
vdr-0e79c2d76ede6225b8d51625e4d55fd1fbd78680.tar.bz2
Added missing calls to cStatus::MsgOsdClear() in cSkins::Message()
-rw-r--r--CONTRIBUTORS3
-rw-r--r--HISTORY2
-rw-r--r--skins.c4
3 files changed, 8 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 83bf5fb0..f6240a20 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1137,3 +1137,6 @@ Uwe Hanke <uhanke@gmx.de>
Mogens Elneff <mogens@elneff.dk>
for translating OSD texts to the Danish language
+
+Joachim Wilke <vdr@joachim-wilke.de>
+ for reporting missing calls to cStatus::MsgOsdClear() in cSkins::Message()
diff --git a/HISTORY b/HISTORY
index 05afc85c..b4a547f9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3124,3 +3124,5 @@ Video Disk Recorder Revision History
- Added Danish language texts (thanks to Mogens Elneff).
- 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).
diff --git a/skins.c b/skins.c
index 6872a947..0129378c 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.1 2004/05/15 12:34:38 kls Exp $
+ * $Id: skins.c 1.2 2004/11/06 11:25:46 kls Exp $
*/
#include "skins.h"
@@ -186,10 +186,12 @@ eKeys cSkins::Message(eMessageType Type, const char *s, int Seconds)
}
else
cSkinDisplay::Current()->SetMessage(Type, NULL);
+ cStatus::MsgOsdClear();
}
else if (!s && displayMessage) {
delete displayMessage;
displayMessage = NULL;
+ cStatus::MsgOsdClear();
}
return k;
}