diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-05-24 23:41:17 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-05-25 01:00:25 +0300 |
| commit | 6b2e66f086ca3f5a15c3baad1af094bce0e43c98 (patch) | |
| tree | 8ef370cb1f76ab75ba68084e562eae76f29a20be | |
| parent | 96cbe528030b16dfb0c17b9668fb441a2cbc22c4 (diff) | |
SL-15292 waitForChannel crash
| -rw-r--r-- | indra/newview/llvoicevivox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp index f9ffefd4a2..f9c8da26a6 100644 --- a/indra/newview/llvoicevivox.cpp +++ b/indra/newview/llvoicevivox.cpp @@ -1759,7 +1759,7 @@ bool LLVivoxVoiceClient::waitForChannel() if (sShuttingDown) { - logoutOfVivox(true); + logoutOfVivox(false); return false; } @@ -1851,9 +1851,9 @@ bool LLVivoxVoiceClient::waitForChannel() mIsProcessingChannels = false; - logoutOfVivox(true); + logoutOfVivox(!sShuttingDown /*bool wait*/); - if (mRelogRequested) + if (mRelogRequested && !sShuttingDown) { LL_DEBUGS("Voice") << "Relog Requested, restarting provisioning" << LL_ENDL; if (!provisionVoiceAccount()) |