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.)
This commit is contained in:
@@ -364,11 +364,11 @@ void PrefsManager::RestoreGamePrefs()
|
|||||||
ASSERT( !m_sCurrentGame.Get().empty() );
|
ASSERT( !m_sCurrentGame.Get().empty() );
|
||||||
|
|
||||||
// load prefs
|
// load prefs
|
||||||
|
GamePrefs gp;
|
||||||
map<CString, GamePrefs>::const_iterator iter = m_mapGameNameToGamePrefs.find( m_sCurrentGame );
|
map<CString, GamePrefs>::const_iterator iter = m_mapGameNameToGamePrefs.find( m_sCurrentGame );
|
||||||
if( iter == m_mapGameNameToGamePrefs.end() )
|
if( iter != m_mapGameNameToGamePrefs.end() )
|
||||||
return;
|
gp = iter->second;
|
||||||
|
|
||||||
const GamePrefs &gp = iter->second;
|
|
||||||
m_sAnnouncer .Set( gp.m_sAnnouncer );
|
m_sAnnouncer .Set( gp.m_sAnnouncer );
|
||||||
m_sTheme .Set( gp.m_sTheme );
|
m_sTheme .Set( gp.m_sTheme );
|
||||||
m_sDefaultModifiers .Set( gp.m_sDefaultModifiers );
|
m_sDefaultModifiers .Set( gp.m_sDefaultModifiers );
|
||||||
|
|||||||
Reference in New Issue
Block a user