[Scummvm-git-logs] scummvm master -> c59dd85ebc42b2133ff98bc9411313a1466f1334

bgK bastien.bouclet at gmail.com
Tue Jan 22 13:11:25 CET 2019


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c59dd85ebc GUI: Don't try loading TTF fonts for themes that don't request one


Commit: c59dd85ebc42b2133ff98bc9411313a1466f1334
    https://github.com/scummvm/scummvm/commit/c59dd85ebc42b2133ff98bc9411313a1466f1334
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2019-01-22T13:07:15+01:00

Commit Message:
GUI: Don't try loading TTF fonts for themes that don't request one

Changed paths:
    gui/ThemeEngine.cpp


diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 4e91768..e57a1ef 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1541,7 +1541,9 @@ const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename, cons
 	const Graphics::Font *font = 0;
 
 	// Prefer scalable fonts over non-scalable fonts
-	font = loadScalableFont(scalableFilename, charset, pointsize, fontName);
+	if (!scalableFilename.empty())
+		font = loadScalableFont(scalableFilename, charset, pointsize, fontName);
+
 	if (!font)
 		font = loadFont(filename, fontName);
 





More information about the Scummvm-git-logs mailing list