summaryrefslogtreecommitdiff
path: root/layout.c
diff options
context:
space:
mode:
authorandreas 'randy' weinberger <vdr@smue.org>2010-11-14 13:27:14 +0100
committerandreas 'randy' weinberger <vdr@smue.org>2010-11-14 13:27:14 +0100
commit97aa570b797460a599696cc22801e968015a5be4 (patch)
tree654958ec4718b64f624221b5a5c6098536c86135 /layout.c
parentaed4434fd79ba560ba30ad2d3b34a837a1f442d1 (diff)
downloadvdr-plugin-graphlcd-97aa570b797460a599696cc22801e968015a5be4.tar.gz
vdr-plugin-graphlcd-97aa570b797460a599696cc22801e968015a5be4.tar.bz2
fixed NULL-pointer-exception when using UTF-8 and Freetype fonts
see http://projects.vdr-developer.org/issues/457 & http://www.vdrportal.de/board/thread.php?postid=955543#post955543
Diffstat (limited to 'layout.c')
-rw-r--r--layout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/layout.c b/layout.c
index 254fbb1..dc5e34d 100644
--- a/layout.c
+++ b/layout.c
@@ -66,7 +66,7 @@ bool cFontElement::Load(const std::string & url)
file += url.substr(4, pos - 4);
}
#if APIVERSNUM >= 10503
- return font.LoadFT2(file, cCharSetConv::SystemCharacterTable(), size);
+ return font.LoadFT2(file, cCharSetConv::SystemCharacterTable() ? cCharSetConv::SystemCharacterTable() : "ISO-8859-1", size);
#else
return font.LoadFT2(file, I18nCharSets()[Setup.OSDLanguage], size);
#endif