From 9df559af08e7a1860a575d7ef29add4df54f95cd Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Fri, 16 Jun 2006 08:51:15 +0000 Subject: [PATCH] Fall back if PREFSMAN->m_sTheme.GetDefault() is not selectable. --- stepmania/src/ThemeManager.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index c430ce219d..5acd0a90c3 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -352,6 +352,11 @@ void ThemeManager::SwitchThemeAndLanguage( const RString &sThemeName_, const RSt RString sLanguage = sLanguage_; if( !IsThemeSelectable(sThemeName) ) sThemeName = PREFSMAN->m_sTheme.GetDefault(); + + if( !IsThemeSelectable(sThemeName) ) + sThemeName = SpecialFiles::BASE_THEME_NAME; + + ASSERT( IsThemeSelectable(sThemeName) ); /* We havn't actually loaded the theme yet, so we can't check whether sLanguage * exists. Just check for empty. */