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

SL-15292 waitForChannel crash #4

master
Andrey Kleshchev 2021-06-23 19:48:45 +03:00
parent 7cc5b01ded
commit 9451b50b2b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llvoicevivox.cpp
View File

@ -703,7 +703,10 @@ void LLVivoxVoiceClient::voiceControlCoro()
performMicTuning();
}
waitForChannel(); // this doesn't normally return unless relog is needed or shutting down
if (!sShuttingDown)
{
waitForChannel(); // this doesn't normally return unless relog is needed or shutting down
}
LL_DEBUGS("Voice") << "lost channel RelogRequested=" << mRelogRequested << LL_ENDL;
endAndDisconnectSession();
@ -1045,7 +1048,14 @@ bool LLVivoxVoiceClient::provisionVoiceAccount()
{
F32 timeout = pow(PROVISION_RETRY_TIMEOUT, static_cast<float>(retryCount));
LL_WARNS("Voice") << "Provision CAP 404. Retrying in " << timeout << " seconds." << LL_ENDL;
llcoro::suspendUntilTimeout(timeout);
if (sShuttingDown)
{
return false;
}
else
{
llcoro::suspendUntilTimeout(timeout);
}
}
else if (!status)
{
@ -1275,6 +1285,8 @@ bool LLVivoxVoiceClient::loginToVivox()
if (!sShuttingDown)
{
// Todo: this is way to long, viewer can get stuck waiting during shutdown
// either make it listen to pump or split in smaller waits with checks for shutdown
llcoro::suspendUntilTimeout(timeout);
}
}