Changed the behaviour of the "Use small font" setup option to *always* use the small font if set to '3' - even if it would have been a fixed font

3 files changed, 7 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e8f25b0e..a0c78683 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1796,6 +1796,8 @@ Suur Karu <suurkaru@fastmail.fm>
 
 Ronny Kornexl <ronny.kornexl@online.de>
  for reporting a problem with setting "No title" for broken event data
+ for suggesting to make the "Use small font" setup option *always* use the small
+ font if set to '3' - even if it would have been a fixed font
 
 Bárta Vladimír <vladimir.barta@k2atmitec.cz>
  for translating OSD texts to the Czech language
diff --git a/HISTORY b/HISTORY
index ad4d470c..05cabe44 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4603,3 +4603,6 @@ Video Disk Recorder Revision History
 - Updated the INSTALL file's section about non-VDR files in the video directory
   (since version 1.3.38 disk access is done in a separate thread, so the watchdog
   timer won't hit).
+- Changed the behaviour of the "Use small font" setup option to *always* use the small
+  font if set to '3' - even if it would have been a fixed font (suggested by Ronny
+  Kornexl).
diff --git a/font.c b/font.c
index 87440d28..fe2ec6e8 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.12 2006/02/05 13:49:10 kls Exp $
+ * $Id: font.c 1.13 2006/04/16 10:59:15 kls Exp $
  */
 
 #include "config.h"
@@ -123,7 +123,7 @@ const cFont *cFont::GetFont(eDvbFont Font)
 {
   if (Setup.UseSmallFont == 0 && Font == fontSml)
      Font = fontOsd;
-  else if (Setup.UseSmallFont == 2 && Font == fontOsd)
+  else if (Setup.UseSmallFont == 2)
      Font = fontSml;
   if (!fonts[Font])
      SetFont(Font);