From 8e5692ffe00ea982da5c548af7b29cbe1b2af934 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Thu, 21 Jan 2016 11:21:06 -0600 Subject: Ensure that a base language is loaded before custom theme Main goal of this patch is to improve error handling when a custom theme does not contain a valid theme version. We were getting a message saying that the theme_ver_err resource did not exist as well as an error saying that the package had failed to load. Now we properly get a single error message about the theme version. Change-Id: I361ef2d139220bbeaf2e856be919dc3a50ae4299 --- gui/pages.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui/pages.hpp') diff --git a/gui/pages.hpp b/gui/pages.hpp index 87e1fb527..b2f25801f 100644 --- a/gui/pages.hpp +++ b/gui/pages.hpp @@ -91,7 +91,7 @@ public: public: int LoadLanguage(char* languageFile, ZipArchive* package); - int Load(ZipArchive* package, char* xmlFile, char* languageFile); + int Load(ZipArchive* package, char* xmlFile, char* languageFile, char* baseLanguageFile); int CheckInclude(ZipArchive* package, xml_document<> *parentDoc); Page* FindPage(std::string name); -- cgit v1.2.3