why
This commit is contained in:
+8
-1
@@ -237,15 +237,19 @@ void TimingData::SetTickcountAtRow( int iRow, int iTicks )
|
|||||||
{
|
{
|
||||||
LOG->Trace( "TimingData::SetTickcountAtRow( '%i' , '%i' )", iRow, iTicks );
|
LOG->Trace( "TimingData::SetTickcountAtRow( '%i' , '%i' )", iRow, iTicks );
|
||||||
|
|
||||||
unsigned i;
|
unsigned i = 0;
|
||||||
vector<TimingSegment *> &ticks = this->allTimingSegments[SEGMENT_TICKCOUNT];
|
vector<TimingSegment *> &ticks = this->allTimingSegments[SEGMENT_TICKCOUNT];
|
||||||
for( i=0; i<ticks.size(); i++ )
|
for( i=0; i<ticks.size(); i++ )
|
||||||
if( ticks[i]->GetRow() >= iRow )
|
if( ticks[i]->GetRow() >= iRow )
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
// this thing causes an invalid parameter crash
|
||||||
TickcountSegment *ts = static_cast<TickcountSegment *>(ticks[i]);
|
TickcountSegment *ts = static_cast<TickcountSegment *>(ticks[i]);
|
||||||
|
LOG->Trace( "Done with that thing again" );
|
||||||
|
|
||||||
if( i == ticks.size() || ts->GetRow() != iRow )
|
if( i == ticks.size() || ts->GetRow() != iRow )
|
||||||
{
|
{
|
||||||
|
LOG->Trace( "New TickSegment" );
|
||||||
// No TickcountSegment here. Make a new segment if required.
|
// No TickcountSegment here. Make a new segment if required.
|
||||||
if (i == 0 ||
|
if (i == 0 ||
|
||||||
static_cast<TickcountSegment *>(ticks[i-1])->GetTicks() != iTicks )
|
static_cast<TickcountSegment *>(ticks[i-1])->GetTicks() != iTicks )
|
||||||
@@ -253,12 +257,15 @@ void TimingData::SetTickcountAtRow( int iRow, int iTicks )
|
|||||||
}
|
}
|
||||||
else // TickcountSegment being modified is m_TickcountSegments[i]
|
else // TickcountSegment being modified is m_TickcountSegments[i]
|
||||||
{
|
{
|
||||||
|
LOG->Trace( "Editing TickSegment" );
|
||||||
if (i > 0 &&
|
if (i > 0 &&
|
||||||
static_cast<TickcountSegment *>(ticks[i-1])->GetTicks() == iTicks )
|
static_cast<TickcountSegment *>(ticks[i-1])->GetTicks() == iTicks )
|
||||||
ticks.erase( ticks.begin()+i, ticks.begin()+i+1 );
|
ticks.erase( ticks.begin()+i, ticks.begin()+i+1 );
|
||||||
else
|
else
|
||||||
ts->SetTicks(iTicks);
|
ts->SetTicks(iTicks);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LOG->Trace( "DONE" );
|
||||||
}
|
}
|
||||||
|
|
||||||
void TimingData::SetComboAtRow( int iRow, int iCombo, int iMiss )
|
void TimingData::SetComboAtRow( int iRow, int iCombo, int iMiss )
|
||||||
|
|||||||
Reference in New Issue
Block a user