ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start music properly in thread, avoid starting track music more than once.

Browse Source
This commit is contained in:
hiker 2015-02-10 17:07:46 +11:00
parent 2106e0caaf
commit ec598d6f41
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modes/world_status.cpp
View File

@ -246,9 +246,10 @@ void WorldStatus::update(const float dt)
return;
case GO_PHASE :
if (m_auxiliary_timer>2.5f && music_manager->getCurrentMusic())
if (m_auxiliary_timer>2.5f && music_manager->getCurrentMusic() &&
!music_manager->getCurrentMusic()->isPlaying())
{
music_manager->startMusic(music_manager->getCurrentMusic());
music_manager->startMusic();
}
if (m_auxiliary_timer > 3.0f) // how long to display the 'go' message
@ -271,7 +272,7 @@ void WorldStatus::update(const float dt)
// Start the music here when starting fast
if (UserConfigParams::m_race_now)
{
music_manager->startMusic(music_manager->getCurrentMusic());
music_manager->startMusic();
UserConfigParams::m_race_now = false;
}
// how long to display the 'music' message