[Scummvm-git-logs] scummvm master -> 76ec66bfa6149a124cfb2b0e4fd5287ae08f68c3

sev- sev at scummvm.org
Thu Oct 1 00:09:47 UTC 2020


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:
76ec66bfa6 Revert "GUI: Properly load fonts when translations are disabled"


Commit: 76ec66bfa6149a124cfb2b0e4fd5287ae08f68c3
    https://github.com/scummvm/scummvm/commit/76ec66bfa6149a124cfb2b0e4fd5287ae08f68c3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-10-01T02:08:39+02:00

Commit Message:
Revert "GUI: Properly load fonts when translations are disabled"

This reverts commit 62c4d6cc0a7c004565d0cc093b81e4813588ad60.

This broke non-Latin fonts loading.

Changed paths:
    gui/ThemeEngine.cpp


diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 27b391071a..c4d5789cb8 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -529,7 +529,7 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &language, const
 	if (textId == -1)
 		return false;
 
-	if (!language.empty() && !language.equals("*")) {
+	if (!language.empty()) {
 #ifdef USE_TRANSLATION
 		Common::String cl = TransMan.getCurrentLanguage();
 		if (!cl.matchString(language, true))




More information about the Scummvm-git-logs mailing list