1 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 970570b135..7b6d9613ac 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -1740,6 +1740,12 @@ bool LLVivoxVoiceClient::waitForChannel()
             mIsProcessingChannels = true;
             llcoro::suspend();
 
+            if (LLApp::isExiting())
+            {
+                mRelogRequested = false;
+                break;
+            }
+
             if (mTuningMode)
             {
                 performMicTuning();
@@ -1784,6 +1790,13 @@ bool LLVivoxVoiceClient::waitForChannel()
             {
                 llcoro::suspendUntilTimeout(1.0);
             }
+
+            if (LLApp::isExiting())
+            {
+                mRelogRequested = false;
+                break;
+            }
+
         } while (mVoiceEnabled && !mRelogRequested);
 
         LL_DEBUGS("Voice")
@@ -1813,7 +1826,7 @@ bool LLVivoxVoiceClient::waitForChannel()
         << " RelogRequested=" << mRelogRequested
         << " VoiceEnabled=" << mVoiceEnabled
         << LL_ENDL;
-    return true;
+    return !LLApp::isExiting();
 }
 
 bool LLVivoxVoiceClient::runSession(const sessionStatePtr_t &session)