From d053cc2fe385bed89a96a54d5e5a02f35f2122e3 Mon Sep 17 00:00:00 2001
From: Zoolooc <lucianm@users.sourceforge.net>
Date: Wed, 23 Mar 2011 23:13:59 +0100
Subject: UTF8 fixes and support for the WAREAGLEICONS vdr patch.

Contributed by Lucian Muresan
---
 layout.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'layout.c')

diff --git a/layout.c b/layout.c
index dc5e34d..8ee8072 100644
--- a/layout.c
+++ b/layout.c
@@ -66,7 +66,8 @@ bool cFontElement::Load(const std::string & url)
             file += url.substr(4, pos - 4);
         }
 #if APIVERSNUM >= 10503
-		return font.LoadFT2(file, cCharSetConv::SystemCharacterTable() ? cCharSetConv::SystemCharacterTable() : "ISO-8859-1", size);
+        // NULL SystemCharacterTable defaults to UTF-8 (see VDR tools.h)
+        return font.LoadFT2(file, cCharSetConv::SystemCharacterTable() ? cCharSetConv::SystemCharacterTable() : "UTF-8", size);
 #else
         return font.LoadFT2(file, I18nCharSets()[Setup.OSDLanguage], size);
 #endif
-- 
cgit v1.2.3