FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not attempt to deregister the same emitter more than once

Browse Source
This commit is contained in:
Erik Hofman
2019-01-26 10:17:11 +01:00
parent c1ee4a9172
commit fd32023437
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/sound/soundmgr_aeonwave.cxx
+1 -3
View File
@@ -418,7 +418,7 @@ void SGSoundMgr::release_source( unsigned int source )
{ {
aax::Emitter& emitter = source_it->second; aax::Emitter& emitter = source_it->second;
enum aaxState state = emitter.state(); enum aaxState state = emitter.state();
if (state == AAX_PLAYING || state == AAX_SUSPENDED) { if (state != AAX_PROCESSED) {
TRY( emitter.set(AAX_PROCESSED) ); TRY( emitter.set(AAX_PROCESSED) );
TRY( d->_aax.remove(emitter) ); TRY( d->_aax.remove(emitter) );
} }
@@ -590,7 +590,6 @@ void SGSoundMgr::sample_stop( SGSoundSample *sample )
#ifdef ENABLE_SOUND #ifdef ENABLE_SOUND
aax::Emitter& emitter = d->get_emitter(source); aax::Emitter& emitter = d->get_emitter(source);
TRY( emitter.set(AAX_PROCESSED) ); TRY( emitter.set(AAX_PROCESSED) );
TRY( d->_aax.remove(emitter) );
#endif #endif
stopped = is_sample_stopped(sample); stopped = is_sample_stopped(sample);
} }
@@ -610,7 +609,6 @@ void SGSoundMgr::sample_destroy( SGSoundSample *sample )
if ( sample->is_playing() ) { if ( sample->is_playing() ) {
aax::Emitter& emitter = d->get_emitter(source); aax::Emitter& emitter = d->get_emitter(source);
TRY( emitter.set(AAX_PROCESSED) ); TRY( emitter.set(AAX_PROCESSED) );
TRY( d->_aax.remove(emitter) );
} }
release_source( source ); release_source( source );
#endif #endif