Fix for the destructor of SoundBuffer. A crash appeared when a sound still had been attached at the time of destruction.

This commit is contained in:
BlueCobold 2015-03-22 07:14:08 +01:00 committed by Lukas Dürrenberger
parent 4add6faf06
commit e78f1bd4ea

View File

@ -65,8 +65,14 @@ m_sounds () // don't copy the attached sounds
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
SoundBuffer::~SoundBuffer() SoundBuffer::~SoundBuffer()
{ {
// First detach the buffer from the sounds that use it (to avoid OpenAL errors) // To prevent the iterator from becoming invalid, move the entire buffer to another
for (SoundList::const_iterator it = m_sounds.begin(); it != m_sounds.end(); ++it) // container. Otherwise calling resetBuffer would result in detachSound being
// called which removes the sound from the internal list.
SoundList sounds;
sounds.swap(m_sounds);
// Detach the buffer from the sounds that use it (to avoid OpenAL errors)
for (SoundList::const_iterator it = sounds.begin(); it != sounds.end(); ++it)
(*it)->resetBuffer(); (*it)->resetBuffer();
// Destroy the buffer // Destroy the buffer