From 9429978fc968b13d75f3b64ce203bf22131f78ab Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 22 Jul 2004 19:29:44 +0000 Subject: [PATCH] fix crash in themes without [OptionNames] use preincrement for iterators, not postincrement --- stepmania/src/ThemeManager.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp index 3a78ba6ee5..6c844a1264 100644 --- a/stepmania/src/ThemeManager.cpp +++ b/stepmania/src/ThemeManager.cpp @@ -652,14 +652,13 @@ void ThemeManager::GetModifierNames( set& AddTo ) const IniFile::key *cur = m_pIniCurMetrics->GetKey( "OptionNames" ); const IniFile::key *base = m_pIniBaseMetrics->GetKey( "OptionNames" ); - for( IniFile::key::const_iterator iter = cur->begin(); iter != cur->end(); iter++ ) - { - AddTo.insert( iter->first ); - } - for( IniFile::key::const_iterator iter = base->begin(); iter != base->end(); iter++ ) - { - AddTo.insert( iter->first ); - } + if( cur ) + for( IniFile::key::const_iterator iter = cur->begin(); iter != cur->end(); ++iter ) + AddTo.insert( iter->first ); + + if( base ) + for( IniFile::key::const_iterator iter = base->begin(); iter != base->end(); ++iter ) + AddTo.insert( iter->first ); } /*