summaryrefslogtreecommitdiff
path: root/font.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-06-02 13:35:54 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-06-02 13:35:54 +0200
commit2de28295fc899065d6be129a2294cf5554cb717b (patch)
tree046fc4aeeceedf2e2de9b94737593a4933153bb3 /font.c
parenteec6b1d818a4a568ca6def00565beed8c301ecab (diff)
downloadvdr-2de28295fc899065d6be129a2294cf5554cb717b.tar.gz
vdr-2de28295fc899065d6be129a2294cf5554cb717b.tar.bz2
Now making sure that the "small font" is never larger than the "osd font"
Diffstat (limited to 'font.c')
-rw-r--r--font.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/font.c b/font.c
index a19d2b4b..f6ffd61b 100644
--- a/font.c
+++ b/font.c
@@ -6,7 +6,7 @@
*
* BiDi support by Osama Alrawab <alrawab@hotmail.com> @2008 Tripoli-Libya.
*
- * $Id: font.c 2.11 2012/05/19 10:15:18 kls Exp $
+ * $Id: font.c 2.12 2012/06/02 13:32:19 kls Exp $
*/
#include "font.h"
@@ -412,7 +412,7 @@ const cFont *cFont::GetFont(eDvbFont Font)
if (!fonts[Font]) {
switch (Font) {
case fontOsd: SetFont(Font, Setup.FontOsd, Setup.FontOsdSize); break;
- case fontSml: SetFont(Font, Setup.FontSml, Setup.FontSmlSize); break;
+ case fontSml: SetFont(Font, Setup.FontSml, min(Setup.FontSmlSize, Setup.FontOsdSize)); break;
case fontFix: SetFont(Font, Setup.FontFix, Setup.FontFixSize); break;
default: esyslog("ERROR: unknown Font %d (%s %d)", Font, __FUNCTION__, __LINE__);
}