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

fix accessing unloaded m_MenuTimer

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-18 20:42:13 +00:00
parent f7af079f63
commit d34a45252c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenWithMenuElements.cpp
+7 -2
View File
@@ -229,6 +229,9 @@ void ScreenWithMenuElements::Update( float fDeltaTime )
void ScreenWithMenuElements::ResetTimer() void ScreenWithMenuElements::ResetTimer()
{ {
if( !m_bTimerEnabled )
return;
if( TIMER_SECONDS > 0.0f && (PREFSMAN->m_bMenuTimer || FORCE_TIMER) && !GAMESTATE->IsEditing() ) if( TIMER_SECONDS > 0.0f && (PREFSMAN->m_bMenuTimer || FORCE_TIMER) && !GAMESTATE->IsEditing() )
{ {
m_MenuTimer->SetSeconds( TIMER_SECONDS ); m_MenuTimer->SetSeconds( TIMER_SECONDS );
@@ -286,7 +289,8 @@ void ScreenWithMenuElements::Cancel( ScreenMessage smSendWhenDone )
if( STOP_MUSIC_ON_BACK ) if( STOP_MUSIC_ON_BACK )
SOUND->StopMusic(); SOUND->StopMusic();
m_MenuTimer->Stop(); if( m_bTimerEnabled )
m_MenuTimer->Stop();
m_Cancel.StartTransitioning( smSendWhenDone ); m_Cancel.StartTransitioning( smSendWhenDone );
} }
@@ -297,7 +301,8 @@ bool ScreenWithMenuElements::IsTransitioning()
void ScreenWithMenuElements::StopTimer() void ScreenWithMenuElements::StopTimer()
{ {
m_MenuTimer->Stop(); if( m_bTimerEnabled )
m_MenuTimer->Stop();
} }
void ScreenWithMenuElements::HandleMessage( const CString& sMessage ) void ScreenWithMenuElements::HandleMessage( const CString& sMessage )