aboutsummaryrefslogtreecommitdiff
path: root/gui/newgui.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gui/newgui.cpp')
-rw-r--r--gui/newgui.cpp22
1 files changed, 13 insertions, 9 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index 211068c30f..d8acabf477 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -128,17 +128,21 @@ bool NewGui::loadNewTheme(const Common::String &style) {
Common::String oldTheme = (_theme != 0) ? _theme->getStylefileName() : "";
delete _theme;
- if (Theme::themeConfigUseable(style, "", &styleType, &cfg)) {
- if (0 == styleType.compareToIgnoreCase("classic"))
- _theme = new ThemeClassic(_system, style, &cfg);
+ if (style.compareToIgnoreCase("classic") == 0) {
+ _theme = new ThemeClassic(_system);
+ } else {
+ if (Theme::themeConfigUseable(style, "", &styleType, &cfg)) {
+ if (0 == styleType.compareToIgnoreCase("classic"))
+ _theme = new ThemeClassic(_system, style, &cfg);
#ifndef DISABLE_FANCY_THEMES
- else if (0 == styleType.compareToIgnoreCase("modern"))
- _theme = new ThemeNew(_system, style, &cfg);
+ else if (0 == styleType.compareToIgnoreCase("modern"))
+ _theme = new ThemeNew(_system, style, &cfg);
#endif
- else
- warning("Unsupported theme type '%s'", styleType.c_str());
- } else {
- warning("Config '%s' is NOT usable for themes or not found", style.c_str());
+ else
+ warning("Unsupported theme type '%s'", styleType.c_str());
+ } else {
+ warning("Config '%s' is NOT usable for themes or not found", style.c_str());
+ }
}
cfg.clear();