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

It's perfectly valid to call is_sample_stopped() even if the sample was already stopped. So remove the assert and replace it with an if-test

Browse Source
This commit is contained in:
Erik Hofman
2016-10-03 09:55:31 +02:00
parent 906813c90b
commit b9deebb59d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
simgear/sound/soundmgr_openal.cxx
View File

@@ -757,11 +757,12 @@ void SGSoundMgr::sample_destroy( SGSoundSample *sample )
bool SGSoundMgr::is_sample_stopped(SGSoundSample *sample)
{
#ifdef ENABLE_SOUND
assert(sample->is_valid_source());
unsigned int source = sample->get_source();
int result;
alGetSourcei( source, AL_SOURCE_STATE, &result );
return (result == AL_STOPPED);
if ( sample->is_valid_source() ) {
ALint source = sample->get_source();
ALint result;
alGetSourcei( source, AL_SOURCE_STATE, &result );
return (result == AL_STOPPED);
}
#else
return true;
#endif