From 7ff4641d5dbb93e4c4cab16a738aa1a2b196f40c Mon Sep 17 00:00:00 2001
From: Joseph-Eugene Winzer
Date: Thu, 9 Mar 2017 02:29:06 +0100
Subject: GUI: Restore settings if GUI cannot be rendered

PR#921 changes the behavior of the client that if the GUI fails to be
rendered the previously applied settings in the misc category are
restored. Error messages were altered according to the changes.

Bug: #9717 GUI: Indirectly changing 'GUI Language' can produce
                inconsistent behaviour when changing some options.
---
 gui/ThemeEngine.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'gui/ThemeEngine.cpp')

diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index c27d36d07e..ecea94524c 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -722,7 +722,9 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file, const Com
 #ifdef USE_TRANSLATION
 			TransMan.setLanguage("C");
 #endif
-			warning("Failed to load localized font '%s'. Using non-localized font and default GUI language instead", localized.c_str());
+			warning("Failed to load localized font '%s'.", localized.c_str());
+
+			return false;
 		}
 	}
 
-- 
cgit v1.2.3