move clean up of old themes to LoadThemeRecursive

2005-11-01 17:42:48 +00:00
parent b2aa109cbc
commit 485bab571f
1 changed files with 4 additions and 4 deletions
@@ -168,6 +168,10 @@ bool ThemeManager::DoesLanguageExist( const CString &sLanguage )

 void ThemeManager::LoadThemeRecursive( deque<Theme> &theme, const CString &sThemeName_ )
 {
+	for( unsigned i = 0; i < g_vThemes.size(); ++i )
+		delete g_vThemes[i].iniMetrics;
+	g_vThemes.clear();
+
 	CString sThemeName(sThemeName_);

 	bool bLoadedBase = false;
@@ -238,10 +242,6 @@ void ThemeManager::SwitchThemeAndLanguage( const CString &sThemeName_, const CSt
 	for( int i = 0; i < NUM_ElementCategory; ++i )
 		g_ThemePathCache[i].clear();

-	for( unsigned i = 0; i < g_vThemes.size(); ++i )
-		delete g_vThemes[i].iniMetrics;
-	g_vThemes.clear();
-
 	// load current theme
 	LoadThemeRecursive( g_vThemes, m_sCurThemeName );