X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/fce66e72c0ad6e000b22fdda7b57f3544763e1ca..da28efe46384a6e23a91e8cb7db726f176bed409:/lib/gdi/font.cpp

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index 09154de0..dfac144c 100644
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -212,7 +212,6 @@ float fontRenderClass::getLineHeight(const gFont& font)
 	if (FTC_Manager_Lookup_Size(cacheManager, &fnt->font.font, &current_face, &fnt->size)<0)
 #endif
 	{
-		delete fnt;
 		eDebug("FTC_Manager_Lookup_Size failed!");
 		return 0;
 	}
@@ -511,13 +510,7 @@ int eTextPara::renderString(const char *string, int rflags)
 	
 	if (!current_font)
 		return -1;
-		
-	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,
@@ -540,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));