Commit 9451b50b authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-15292 waitForChannel crash #4

parent 7cc5b01d
......@@ -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);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment