Now making sure that the "small font" is never larger than the "osd font"

3 files changed, 5 insertions, 4 deletions

diff --git a/HISTORY b/HISTORY
index d9cb9233..53073f5d 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7137,3 +7137,4 @@ Video Disk Recorder Revision History
   (in which case you may want to switch to the "ST:TNG" or "Classic VDR" skin).
 - Finally removed the code marked with __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS
   and LEGACY_CRECEIVER.
+- Now making sure that the "small font" is never larger than the "osd font".
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__);
        }
diff --git a/osd.c b/osd.c
index 2edf4fae..37ee310e 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.30 2012/06/02 10:42:23 kls Exp $
+ * $Id: osd.c 2.31 2012/06/02 13:32:38 kls Exp $
  */
 
 #include "osd.h"
@@ -2006,7 +2006,7 @@ void cOsdProvider::UpdateOsdSize(bool Force)
      Setup.FontSmlSize = int(round(Height * Setup.FontSmlSizeP));
      cFont::SetFont(fontOsd, Setup.FontOsd, Setup.FontOsdSize);
      cFont::SetFont(fontFix, Setup.FontFix, Setup.FontFixSize);
-     cFont::SetFont(fontSml, Setup.FontSml, Setup.FontSmlSize);
+     cFont::SetFont(fontSml, Setup.FontSml, min(Setup.FontSmlSize, Setup.FontOsdSize));
      oldWidth = Width;
      oldHeight = Height;
      oldAspect = Aspect;