From f9da743e59104adf14a8aed452758d90ed208811 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Thu, 12 May 2011 20:50:38 -0400 Subject: [PATCH] [splittiming] Fix editor bug on create & no save. Hmm...is this bug also in default? --- src/NoteField.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/NoteField.cpp b/src/NoteField.cpp index 5f76e23d3e..06f73b18d1 100644 --- a/src/NoteField.cpp +++ b/src/NoteField.cpp @@ -739,10 +739,12 @@ void NoteField::DrawPrimitives() cur->m_ReceptorArrowRow.Draw(); } + Steps *stepChecking = GAMESTATE->m_pCurSteps[m_pPlayerState->m_PlayerNumber]; + // Draw beat bars - if( GAMESTATE->IsEditing() || SHOW_BEAT_BARS ) + if( ( GAMESTATE->IsEditing() || SHOW_BEAT_BARS ) && stepChecking != NULL ) { - const vector &vTimeSignatureSegments = GAMESTATE->m_pCurSteps[m_pPlayerState->m_PlayerNumber]->m_Timing.m_vTimeSignatureSegments; + const vector &vTimeSignatureSegments = stepChecking->m_Timing.m_vTimeSignatureSegments; int iMeasureIndex = 0; FOREACH_CONST( TimeSignatureSegment, vTimeSignatureSegments, iter ) { @@ -781,11 +783,11 @@ void NoteField::DrawPrimitives() } } - if( GAMESTATE->IsEditing() ) + if( GAMESTATE->IsEditing() && stepChecking != NULL ) { ASSERT(GAMESTATE->m_pCurSong); - const TimingData &timing = GAMESTATE->m_pCurSteps[m_pPlayerState->m_PlayerNumber]->m_Timing; + const TimingData &timing = stepChecking->m_Timing; // BPM text FOREACH_CONST( BPMSegment, timing.m_BPMSegments, seg )