Second Life viewer sources 1.15.1.3

2 files changed, 10 insertions, 16 deletions

diff --git a/linden/indra/llaudio/audioengine.cpp b/linden/indra/llaudio/audioengine.cpp
index edfa123..d5c2a40 100644
--- a/linden/indra/llaudio/audioengine.cpp
+++ b/linden/indra/llaudio/audioengine.cpp
@@ -134,28 +134,22 @@ void LLAudioEngine::shutdown()
 
         // Clean up channels
         S32 i;
-        if (mChannels)
+        for (i = 0; i < MAX_CHANNELS; i++)
         {
-                for (i = 0; i < MAX_CHANNELS; i++)
+                if (mChannels[i])
                 {
-                        if (mChannels[i])
-                        {
-                                delete mChannels[i];
-                                mChannels[i] = NULL;
-                        }
+                        delete mChannels[i];
+                        mChannels[i] = NULL;
                 }
         }
 
         // Clean up buffers
-        if (mBuffers)
+        for (i = 0; i < MAX_BUFFERS; i++)
         {
-                for (i = 0; i < MAX_BUFFERS; i++)
+                if (mBuffers[i])
                 {
-                        if (mBuffers[i])
-                        {
-                                delete mBuffers[i];
-                                mBuffers[i] = NULL;
-                        }
+                        delete mBuffers[i];
+                        mBuffers[i] = NULL;
                 }
         }
 }
@@ -575,7 +569,7 @@ LLAudioChannel * LLAudioEngine::getFreeChannel(const F32 priority)
                 }
         }
 
-        if (min_priority > priority)
+        if (min_priority > priority || !min_channelp)
         {
                 // All playing channels have higher priority, return.
                 return NULL;
diff --git a/linden/indra/llaudio/audioengine_fmod.cpp b/linden/indra/llaudio/audioengine_fmod.cpp
index 485b95b..4574a57 100644
--- a/linden/indra/llaudio/audioengine_fmod.cpp
+++ b/linden/indra/llaudio/audioengine_fmod.cpp
@@ -950,7 +950,7 @@ void LLAudioEngine_FMOD::pauseInternetStream(int pause)
                         stopInternetStream();
                 }
         }
-        else if (mInternetStreamURL)
+        else
         {
                 startInternetStream(mInternetStreamURL);
         }