actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix crash when no choices due to m_iChoiceInRowWithFocus not being

Browse Source 
set to -1 yet
This commit is contained in:
Glenn Maynard
2005-07-15 07:19:36 +00:00
parent 618f71f3d4
commit d0c2daeadb
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+4 -5
View File
@@ -279,11 +279,6 @@ void OptionRow::InitText()
BitmapText *bt = new BitmapText( m_textItemParent ); BitmapText *bt = new BitmapText( m_textItemParent );
m_textItems.push_back( bt ); m_textItems.push_back( bt );
const int iChoiceInRowWithFocus = m_iChoiceInRowWithFocus[p];
CString sText = (iChoiceInRowWithFocus==-1) ? "" : m_RowDef.m_vsChoices[iChoiceInRowWithFocus];
PrepareItemText( sText );
bt->SetText( sText );
bt->RunCommands( ITEMS_ON_COMMAND ); bt->RunCommands( ITEMS_ON_COMMAND );
bt->SetShadowLength( 0 ); bt->SetShadowLength( 0 );
@@ -418,6 +413,8 @@ void OptionRow::AfterImportOptions()
if( m_bFirstItemGoesDown ) if( m_bFirstItemGoesDown )
FOREACH_PlayerNumber( p ) FOREACH_PlayerNumber( p )
m_iChoiceInRowWithFocus[p] = 0; m_iChoiceInRowWithFocus[p] = 0;
UpdateText();
} }
void OptionRow::LoadExit() void OptionRow::LoadExit()
@@ -504,6 +501,8 @@ void OptionRow::UpdateText()
{ {
unsigned pn = m_RowDef.m_bOneChoiceForAllPlayers ? 0 : p; unsigned pn = m_RowDef.m_bOneChoiceForAllPlayers ? 0 : p;
int iChoiceWithFocus = m_iChoiceInRowWithFocus[pn]; int iChoiceWithFocus = m_iChoiceInRowWithFocus[pn];
if( iChoiceWithFocus == -1 )
continue;
CString sText = m_RowDef.m_vsChoices[iChoiceWithFocus]; CString sText = m_RowDef.m_vsChoices[iChoiceWithFocus];
PrepareItemText( sText ); PrepareItemText( sText );