From: ghost <andreas.monzner@multimedia-labs.de>
Date: Tue, 21 Apr 2009 08:31:03 +0000 (+0200)
Subject: font.cpp: fix
X-Git-Tag: 2.6.0~333^2~3
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/c2f6474c1a8c25e9a89b073f8a41ab07cf21db3e?hp=15a8fe81499c156e251986f5bd33801f54c140e9

font.cpp: fix
---

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index 6a6007ee..dfac144c 100644
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -511,17 +511,6 @@ int eTextPara::renderString(const char *string, int rflags)
 	if (!current_font)
 		return -1;
 
-	if (!current_face)
-		eFatal("eTextPara::renderString: no current_face");
-	if (!current_face->size)
-		eFatal("eTextPara::renderString: no current_face->size");
-
-	if (cursor.y()==-1)
-	{
-		cursor=ePoint(area.x(), area.y()+(current_face->size->metrics.ascender>>6));
-		left=cursor.x();
-	}
-		
 #ifdef HAVE_FREETYPE2
 	if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
  				    current_font->scaler.face_id,
@@ -544,7 +533,18 @@ int eTextPara::renderString(const char *string, int rflags)
 		cache_current_font=&current_font->font.font;
 	}
 #endif
-	
+
+	if (!current_face)
+		eFatal("eTextPara::renderString: no current_face");
+	if (!current_face->size)
+		eFatal("eTextPara::renderString: no current_face->size");
+
+	if (cursor.y()==-1)
+	{
+		cursor=ePoint(area.x(), area.y()+(current_face->size->metrics.ascender>>6));
+		left=cursor.x();
+	}
+
 	std::vector<unsigned long> uc_string, uc_visual;
 	if (string)
 		uc_string.reserve(strlen(string));