From c8f38629efd8016df6bf0bf12e89ecd0924e8b91 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 3 Nov 2005 19:53:27 +0000 Subject: [PATCH] ThemeManager::ReloadMetrics: only reload metrics, not the whole theme. This is much less unintrusive, and fixes crashes on most "retry" theme dialogs due to reloading and resetting Lua and other things unexpectedly in the middle of a screen load. --- stepmania/src/ThemeManager.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 9819f212ac..2632619e83 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -681,12 +681,8 @@ bool ThemeManager::HasMetric( const CString &sClassName, const CString &sValueNa void ThemeManager::ReloadMetrics() { // force a reload of the metrics cache - const CString sThemeName = m_sCurThemeName; - const CString sCurLanguage = m_sCurLanguage; - m_sCurThemeName = ""; - m_sCurLanguage = ""; + LoadThemeMetrics( g_vThemes, m_sCurThemeName, m_sCurLanguage ); - SwitchThemeAndLanguage( sThemeName, sCurLanguage ); if( SCREENMAN ) SCREENMAN->SystemMessage( "Reloaded metrics" );