From acb200345bc26a26c1952ac6c842d5c6849c8bd6 Mon Sep 17 00:00:00 2001
From: ximion <ximion@6778bc44-b910-0410-a7a0-be141de4315d>
Date: Thu, 5 Jan 2012 18:35:53 +0000
Subject: [PATCH] renderer: Improve font error-handling

git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@1377 6778bc44-b910-0410-a7a0-be141de4315d
---
 src/libprojectM/Renderer/Renderer.cpp | 21 ++++++++++++++-------
 src/projectM-jack/CMakeLists.txt      |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/libprojectM/Renderer/Renderer.cpp b/src/libprojectM/Renderer/Renderer.cpp
index d8b5bba04..acae0655f 100644
--- a/src/libprojectM/Renderer/Renderer.cpp
+++ b/src/libprojectM/Renderer/Renderer.cpp
@@ -49,16 +49,23 @@ Renderer::Renderer(int width, int height, int gx, int gy, int texsize, BeatDetec
 
 	title_font = new FTGLPixmapFont(title_fontURL.c_str());
 	other_font = new FTGLPixmapFont(menu_fontURL.c_str());
-	other_font->UseDisplayList(true);
-	title_font->UseDisplayList(true);
-
 	poly_font = new FTGLExtrdFont(title_fontURL.c_str());
 
-	poly_font->UseDisplayList(true);
-	poly_font->Depth(20);
-	poly_font->FaceSize(72);
+	if(title_font->Error()) {
+		fprintf(stderr, "Failed to open font %s\n", title_fontURL.c_str());
+	} else {
+		title_font->UseDisplayList(true);
+	}
 
-	poly_font->UseDisplayList(true);
+	other_font->UseDisplayList(true);
+
+	if(poly_font->Error()) {
+		fprintf(stderr, "Failed to open font %s\n", title_fontURL.c_str());
+	} else {
+		poly_font->UseDisplayList(true);
+		poly_font->Depth(20);
+		poly_font->FaceSize(72);
+	}
 
 #endif /** USE_FTGL */
 
diff --git a/src/projectM-jack/CMakeLists.txt b/src/projectM-jack/CMakeLists.txt
index ff4f4774e..84a6798a8 100644
--- a/src/projectM-jack/CMakeLists.txt
+++ b/src/projectM-jack/CMakeLists.txt
@@ -86,7 +86,7 @@ endif (${CMAKE_PROJECT_NAME} MATCHES "projectM-complete")
 
 INCLUDE_DIRECTORIES(${PROJECTM_INCLUDE} ${JACK_INCLUDEDIR} ${SDL_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTOPENGL_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
 
-LINK_DIRECTORIES(${PROJECTM_LINK} ${JACK_LDFLAGS})
+LINK_DIRECTORIES(${PROJECTM_LINK})
 
 if(COMMAND cmake_policy)
       cmake_policy(SET CMP0003 NEW)