summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-05-26 01:32:52 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-05-26 01:47:54 +0300
commit8e862032d1fb0a75dfc07de1f674fb61422b9f37 (patch)
treec629ab923e8a4607473c098d5cdd4e86b8be9883 /indra
parent6b2e66f086ca3f5a15c3baad1af094bce0e43c98 (diff)
SL-15292 waitForChannel crash #2
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llvoicevivox.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index f9c8da26a6..96b7dac59d 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -1326,6 +1326,11 @@ void LLVivoxVoiceClient::logoutOfVivox(bool wait)
result = llcoro::suspendUntilEventOnWithTimeout(mVivoxPump, LOGOUT_ATTEMPT_TIMEOUT, timeoutResult);
+ if (sShuttingDown)
+ {
+ break;
+ }
+
LL_DEBUGS("Voice") << "event=" << ll_stream_notation_sd(result) << LL_ENDL;
// Don't get confused by prior queued events -- note that it's
// very important that mVivoxPump is an LLEventMailDrop, which