Fixed stripping i18n stuff from font names

2 files changed, 14 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index c285282b..b538aa7f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5270,3 +5270,4 @@ Video Disk Recorder Revision History
 - Fonts can now be created with a width that overwrites the default width (thanks
   to Andreas Mair).
 - Added full weekday names to i18n.c for plugins to use (thanks to Patrice Staudt).
+- Fixed stripping i18n stuff from font names (reported by Anssi Hannula).
diff --git a/font.c b/font.c
index aeaa1da7..19753bfc 100644
--- a/font.c
+++ b/font.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: font.c 1.20 2007/06/23 10:41:10 kls Exp $
+ * $Id: font.c 1.21 2007/06/23 11:25:42 kls Exp $
  */
 
 #include "font.h"
@@ -354,9 +354,19 @@ bool cFont::GetAvailableFontNames(cStringList *FontNames, bool Monospaced)
          char *s = (char *)FcNameUnparse(fontset->fonts[i]);
          if (s) {
             // Strip i18n stuff:
+            char *c = strchr(s, ':');
+            if (c) {
+               char *p = strchr(c + 1, ',');
+               if (p)
+                  *p = 0;
+               }
             char *p = strchr(s, ',');
-            if (p)
-               *p = 0;
+            if (p) {
+               if (c)
+                  memmove(p, c, strlen(c) + 1);
+               else
+                  *p = 0;
+               }
             // Make it user presentable:
             s = strreplace(s, "\\", ""); // '-' is escaped
             s = strreplace(s, "style=", "");