From a345a16d3b51a4c13d243f25f250d866f3b41c11 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 15 Jan 2006 22:11:30 +0000 Subject: [PATCH] Fix RestoreGamePrefs when restoring to a game that hasn't been used before: it wouldn't be in m_mapGameNameToGamePrefs, so we'd keep the prefs of the previous game and Static.ini wouldn't be loaded. (Theme still isn't being applied correctly.) --- stepmania/src/PrefsManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 4cf12a018f..70836c776f 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -364,11 +364,11 @@ void PrefsManager::RestoreGamePrefs() ASSERT( !m_sCurrentGame.Get().empty() ); // load prefs + GamePrefs gp; map::const_iterator iter = m_mapGameNameToGamePrefs.find( m_sCurrentGame ); - if( iter == m_mapGameNameToGamePrefs.end() ) - return; + if( iter != m_mapGameNameToGamePrefs.end() ) + gp = iter->second; - const GamePrefs &gp = iter->second; m_sAnnouncer .Set( gp.m_sAnnouncer ); m_sTheme .Set( gp.m_sTheme ); m_sDefaultModifiers .Set( gp.m_sDefaultModifiers );