From af7bbb7b4404439580666b31388dd8dbef481011 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Wed, 18 Aug 2010 15:55:40 -0600
Subject: Fix Theme loading

Reviewed-by: Freeyorp
---
 src/gui/theme.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

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
-- 
cgit v1.2.3-70-g09d2