livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-15292 waitForChannel crash

meow-7.2.2
Andrey Kleshchev 2021-05-24 23:41:17 +03:00
parent 96cbe52803
commit 6b2e66f086
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llvoicevivox.cpp
View File

@ -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())