Changeset 7855 for code/trunk/src

Timestamp:

Feb 11, 2011, 2:20:13 PM (14 years ago)

Author:

landauf

Message:

fixed a bug which caused the application to crash if the game was ended while cross-fading ambient sound. in particular AmbientSound registered itself again at SoundManager as soon as SoundManager was deleted. added a bool to prevent this behavior.

Location:

code/trunk/src/orxonox/sound

Files:

• SoundManager.cc (modified) (4 diffs)
• SoundManager.h (modified) (1 diff)

code/trunk/src/orxonox/sound/SoundManager.cc

@@ -70 +70 @@
     {
         RegisterRootObject(SoundManager);
+        
+        this->bDestructorCalled_ = false;
 
         // See whether we even want to load
@@ -163 +165 @@
     {
         // Erase fade lists because of the smart pointers
+        this->bDestructorCalled_ = true;
         this->fadeInList_.clear();
         this->fadeOutList_.clear();
@@ -343 +346 @@
     void SoundManager::registerAmbientSound(AmbientSound* newAmbient)
     {
-        if (newAmbient != NULL)
+        if (newAmbient != NULL && !this->bDestructorCalled_)
         {
             for (AmbientList::const_iterator it = this->ambientSounds_.begin(); it != this->ambientSounds_.end(); ++it)
@@ -366 +369 @@
     void SoundManager::unregisterAmbientSound(AmbientSound* oldAmbient)
     {
-        if (oldAmbient == NULL || ambientSounds_.empty())
+        if (oldAmbient == NULL || ambientSounds_.empty() || this->bDestructorCalled_)
             return;
 

code/trunk/src/orxonox/sound/SoundManager.h

@@ -146 +146 @@
         std::vector<ALuint> availableSoundSources_;
         std::vector<std::pair<ALuint, BaseSound*> > usedSoundSources_;
+        
+        bool bDestructorCalled_; ///< Becomes true if the destructor is called - used to prevent ambient sounds from registering after the lists were cleared
 
         static SoundManager* singletonPtr_s;