immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #287 from andreymal/dev-fix-sound 

fixed m_oldMusic.push_back(nullptr) and segfault
dev-ui
krzys-h 2014-03-02 16:05:58 +01:00
parent fef338da24 1a0dcedf83
commit b878f42d47
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/sound/oalsound/alsound.cpp
View File

@ -514,7 +514,6 @@ void ALSound::FrameMove(float delta)
{ {
continue; continue;
} }
if (it.second->IsMuted()) if (it.second->IsMuted())
{ {
it.second->SetVolume(0.0f); it.second->SetVolume(0.0f);
@ -686,12 +685,15 @@ bool ALSound::PlayPauseMusic(const std::string &filename, bool repeat)
{ {
if (m_previousMusic.fadeTime > 0.0f) if (m_previousMusic.fadeTime > 0.0f)
{ {
OldMusic old; if(m_currentMusic)
old.music = m_currentMusic; {
old.fadeTime = 2.0f; OldMusic old;
old.currentTime = 0.0f; old.music = m_currentMusic;
m_oldMusic.push_back(old); old.fadeTime = 2.0f;
m_currentMusic = nullptr; old.currentTime = 0.0f;
m_oldMusic.push_back(old);
m_currentMusic = nullptr;
}
} }
else else
{ {