Fall back if PREFSMAN->m_sTheme.GetDefault() is not selectable.

2006-06-16 08:51:15 +00:00
parent aef9e00016
commit 9df559af08
1 changed files with 5 additions and 0 deletions
@@ -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. */