From a5dd5037f894338ee97e458041d22ceae9cd0183 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 10 Oct 2020 01:10:53 +0300
Subject: SL-13830 One more crash when quiting on startup or right after
 teleport

---
 indra/newview/llvoicevivox.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 976ef61d8e..a8d668420e 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -1744,6 +1744,12 @@ bool LLVivoxVoiceClient::waitForChannel()
             return false;
         }
 
+        if (sShuttingDown)
+        {
+            logoutOfVivox(true);
+            return false;
+        }
+
         if (LLVoiceClient::instance().getVoiceEffectEnabled())
         {
             retrieveVoiceFonts();
-- 
cgit v1.2.3