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

fix crash if a sound is played, copied, and then the parent is given over

Browse Source 
to RageSoundManager; don't think this ever actually happens
This commit is contained in:
Glenn Maynard
2004-05-01 05:13:09 +00:00
parent 051cc33b43
commit 84ac4d3fc9
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundManager.cpp
+10
View File
@@ -98,6 +98,16 @@ void RageSoundManager::Update(float delta)
if( !(*it)->IsPlaying() ) if( !(*it)->IsPlaying() )
ToDelete.insert( *it ); ToDelete.insert( *it );
/* Don't delete any sounds that are the parent of another sound. Always delete
* child sounds first. */
for( it = owned_sounds.begin(); it != owned_sounds.end(); ++it )
if( (*it)->GetOriginal() != (*it) ) // child
{
set<RageSound *>::iterator parent = ToDelete.find( (*it)->GetOriginal() );
if( parent != ToDelete.end() )
ToDelete.erase( parent );
}
for( it = ToDelete.begin(); it != ToDelete.end(); ++it ) for( it = ToDelete.begin(); it != ToDelete.end(); ++it )
owned_sounds.erase( *it ); owned_sounds.erase( *it );
g_SoundManMutex.Unlock(); /* finished with owned_sounds */ g_SoundManMutex.Unlock(); /* finished with owned_sounds */