From 1f721e929fdec3b5f6d90dbece6b3112fab4c681 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sat, 28 Jan 2017 11:40:45 +0100
Subject: GRAPHICS: Implemented MacFont fallback

---
 graphics/macgui/macfontmanager.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'graphics/macgui/macfontmanager.cpp')

diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 08b225a789..cf7ec4094e 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -290,12 +290,14 @@ const char *MacFontManager::getFontName(int id, int size, int slant) {
 	static char name[128];
 	Common::String n;
 
-	if (_extraFontNames.contains(id))
+	if (_extraFontNames.contains(id)) {
 		n = _extraFontNames[id];
-	else if (id < ARRAYSIZE(fontNames))
+	} else if (id < ARRAYSIZE(fontNames)) {
 		n = fontNames[id];
-	else
-		return NULL;
+	} else {
+		warning("MacFontManager: Requested font ID %d not found. Falling back to Chicago", id);
+		n = fontNames[0]; // Fallback to Chicago
+	}
 
 	snprintf(name, 128, "%s-%d-%d", n.c_str(), slant, size);
 
-- 
cgit v1.2.3