actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent falling back further than the base theme, even if it's renamed

Browse Source
This commit is contained in:
Glenn Maynard
2005-10-14 04:51:16 +00:00
parent 6fad243327
commit 247b9c3fb5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.cpp
+6 -4
View File
@@ -175,9 +175,6 @@ void ThemeManager::LoadThemeRecursive( deque<Theme> &theme, const CString &sThem
depth++; depth++;
ASSERT_M( depth < 20, "Circular theme fallback references detected." ); ASSERT_M( depth < 20, "Circular theme fallback references detected." );
if( !sThemeName.CompareNoCase(BASE_THEME_NAME) )
loaded_base = true;
Theme t; Theme t;
t.iniMetrics = new IniFile; t.iniMetrics = new IniFile;
t.sThemeName = sThemeName; t.sThemeName = sThemeName;
@@ -186,6 +183,11 @@ void ThemeManager::LoadThemeRecursive( deque<Theme> &theme, const CString &sThem
if( m_sCurLanguage.CompareNoCase(BASE_LANGUAGE) ) if( m_sCurLanguage.CompareNoCase(BASE_LANGUAGE) )
t.iniMetrics->ReadFile( GetLanguageIniPath(sThemeName,m_sCurLanguage) ); t.iniMetrics->ReadFile( GetLanguageIniPath(sThemeName,m_sCurLanguage) );
bool bIsBaseTheme = !sThemeName.CompareNoCase(BASE_THEME_NAME);
t.iniMetrics->GetValue( "Global", "IsBaseTheme", bIsBaseTheme );
if( bIsBaseTheme )
loaded_base = true;
/* Read the fallback theme. If no fallback theme is specified, and we havn't /* Read the fallback theme. If no fallback theme is specified, and we havn't
* already loaded it, fall back on BASE_THEME_NAME. That way, default theme * already loaded it, fall back on BASE_THEME_NAME. That way, default theme
* fallbacks can be disabled with "FallbackTheme=". */ * fallbacks can be disabled with "FallbackTheme=". */
@@ -200,7 +202,7 @@ void ThemeManager::LoadThemeRecursive( deque<Theme> &theme, const CString &sThem
g_vThemes.push_front( t ); g_vThemes.push_front( t );
if( !sThemeName.CompareNoCase(sThemeName) ) if( bIsBaseTheme )
loaded_base = false; loaded_base = false;
depth--; depth--;