summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2010-08-18 15:55:40 -0600
committerJared Adams <jaxad0127@gmail.com>2010-08-18 21:11:11 -0600
commitaf7bbb7b4404439580666b31388dd8dbef481011 (patch)
tree323d74de361e857ed393e75934c6ca489fbf5631 /src
parent362a539125dff292614618d5ebf61e0c71dfae9f (diff)
downloadmana-af7bbb7b4404439580666b31388dd8dbef481011.tar.gz
mana-af7bbb7b4404439580666b31388dd8dbef481011.tar.bz2
mana-af7bbb7b4404439580666b31388dd8dbef481011.tar.xz
mana-af7bbb7b4404439580666b31388dd8dbef481011.zip
Fix Theme loading
Reviewed-by: Freeyorp
Diffstat (limited to 'src')
-rw-r--r--src/gui/theme.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 12de1f91..f80fa272 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -326,6 +326,7 @@ bool Theme::tryThemePath(std::string themePath)
if (!themePath.empty())
{
themePath = defaultThemePath + themePath;
+
if (PHYSFS_exists(themePath.c_str()))
{
mThemePath = themePath;
@@ -338,6 +339,9 @@ bool Theme::tryThemePath(std::string themePath)
void Theme::prepareThemePath()
{
+ // Ensure the Theme object has been created
+ instance();
+
// Try theme from settings
if (!tryThemePath(config.getValue("theme", "")))
// Try theme from branding