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

nudge more

Browse Source 
we assume we have at least one option in SELECT_ONE and tend
to crash if we don't; assert it
This commit is contained in:
Glenn Maynard
2006-01-18 04:19:40 +00:00
parent 40eacaa61d
commit 6e7af389e8
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/OptionRow.cpp
+18 -11
View File
@@ -450,17 +450,15 @@ void OptionRow::AfterImportOptions()
case SELECT_ONE:
{
/* Make sure the row actually has a selection. */
bool bHasASelection = false;
for( unsigned i=0; i<m_vbSelected[p].size(); i++ )
int iSelection = GetOneSelection(p, true) != -1;
if( iSelection == -1 )
{
if( m_vbSelected[p][i] )
bHasASelection = true;
}
if( !bHasASelection && !m_vbSelected[p].empty() )
ASSERT( !m_vbSelected[p].empty() );
m_vbSelected[p][0] = true;
iSelection = 0;
}
m_iChoiceInRowWithFocus[p] = GetOneSelection(p, true); // focus on the selection we just set
m_iChoiceInRowWithFocus[p] = iSelection; // focus on the selection we just set
}
break;
case SELECT_MULTIPLE:
@@ -929,10 +927,19 @@ void OptionRow::Reload()
switch( m_pHand->m_Def.m_selectType )
{
case SELECT_ONE:
m_iChoiceInRowWithFocus[p] = GetOneSelection(p, true);
if( m_iChoiceInRowWithFocus[p] == -1 )
m_iChoiceInRowWithFocus[p] = 0;
{
/* Make sure the row actually has a selection. */
int iSelection = GetOneSelection(p, true) != -1;
if( iSelection == -1 )
{
ASSERT( !m_vbSelected[p].empty() );
m_vbSelected[p][0] = true;
iSelection = 0;
}
m_iChoiceInRowWithFocus[p] = iSelection; // focus on the selection we just set
break;
}
case SELECT_MULTIPLE:
case SELECT_NONE:
m_iChoiceInRowWithFocus[p] = 0;