From 1378f599c296c2cb1a587146cfa2007578d70766 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 19 May 2012 10:20:16 +0200
Subject: [PATCH] Fixed checking for UTF-8 support in cFont::Bidi()

---
 CONTRIBUTORS | 1 +
 HISTORY      | 3 ++-
 font.c       | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b1f19e45..e9027031 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2860,6 +2860,7 @@ Torsten Lang <info@torstenlang.de>
  of EPG data from BSkyB's "MTV MUSIC"
  for suggesting to make BIDI support check at runtime whether the system runs with
  UTF-8
+ for reporting a bug in checking for UTF-8 support in cFont::Bidi()
 
 Christian Ruppert <idl0r@gentoo.org>
  for some improvements to the Makefiles
diff --git a/HISTORY b/HISTORY
index ad957cc9..792222b8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7052,7 +7052,7 @@ Video Disk Recorder Revision History
 - Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
   Schmirler).
 
-2012-05-17: Version 1.7.28
+2012-05-19: Version 1.7.28
 
 - Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4.
 - Fixed getting the maximum short channel name length in case there are no short names
@@ -7111,3 +7111,4 @@ Video Disk Recorder Revision History
 - The DrawText() functions of the OSD now accept the new alignment flag taBorder,
   which triggers keeping a proper distance from the edge that taLeft or taRight
   aligns to.
+- Fixed checking for UTF-8 support in cFont::Bidi() (reported by Torsten Lang).
diff --git a/font.c b/font.c
index 706a017c..a19d2b4b 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.10 2012/03/02 10:47:45 kls Exp $
+ * $Id: font.c 2.11 2012/05/19 10:15:18 kls Exp $
  */
 
 #include "font.h"
@@ -508,7 +508,7 @@ cString cFont::GetFontFileName(const char *FontName)
 #ifdef BIDI
 cString cFont::Bidi(const char *Ltr)
 {
-  if (cCharSetConv::SystemCharacterTable()) { // bidi requires UTF-8
+  if (!cCharSetConv::SystemCharacterTable()) { // bidi requires UTF-8
      fribidi_set_mirroring(true);
      fribidi_set_reorder_nsm(false);
      FriBidiCharSet fribidiCharset = FRIBIDI_CHAR_SET_UTF8;