summaryrefslogtreecommitdiff
path: root/osd.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2010-05-02 13:59:11 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2010-05-02 13:59:11 +0200
commitc19c63530e9eba17e39c14c987ee30793eb999dd (patch)
tree49905785de6642e3fb9d0c1c0c716c4364219376 /osd.c
parentfd554d9750758611b9c82cda9c79fe3e2ef26537 (diff)
downloadvdr-c19c63530e9eba17e39c14c987ee30793eb999dd.tar.gz
vdr-c19c63530e9eba17e39c14c987ee30793eb999dd.tar.bz2
Fixed handling "none" color entries in XPM files
Diffstat (limited to 'osd.c')
-rw-r--r--osd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/osd.c b/osd.c
index cc603375..9d4e6a42 100644
--- a/osd.c
+++ b/osd.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: osd.c 2.9 2010/01/22 15:58:39 kls Exp $
+ * $Id: osd.c 2.10 2010/05/02 13:56:53 kls Exp $
*/
#include "osd.h"
@@ -360,10 +360,10 @@ bool cBitmap::SetXpm(const char *const Xpm[], bool IgnoreNone)
}
s = skipspace(s + 1);
if (strcasecmp(s, "none") == 0) {
- s = "#00000000";
NoneColorIndex = i;
- if (IgnoreNone)
- continue;
+ if (!IgnoreNone)
+ SetColor(i, clrTransparent);
+ continue;
}
if (*s != '#') {
esyslog("ERROR: unknown color code in XPM: '%c'", *s);