Skip to content

Commit 27fa9b8

Browse files
authored
Merge pull request #2372 from secondlife/roxie/webrtc-fix-mac-p2p-hang
Fix hang when incoming p2p or group calls throw up dialog.
2 parents 738b39f + 7b1d185 commit 27fa9b8

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

indra/newview/llvoicewebrtc.cpp

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -549,13 +549,19 @@ void LLWebRTCVoiceClient::voiceConnectionCoro()
549549
updatePosition();
550550
}
551551
}
552-
553-
sessionState::processSessionStates();
554-
if (mProcessChannels && voiceEnabled && !mHidden)
555-
{
556-
sendPositionUpdate(false);
557-
updateOwnVolume();
558-
}
552+
LL::WorkQueue::postMaybe(mMainQueue,
553+
[=] {
554+
if (sShuttingDown)
555+
{
556+
return;
557+
}
558+
sessionState::processSessionStates();
559+
if (mProcessChannels && voiceEnabled && !mHidden)
560+
{
561+
sendPositionUpdate(false);
562+
updateOwnVolume();
563+
}
564+
});
559565
}
560566
}
561567
catch (const LLCoros::Stop&)
@@ -2221,6 +2227,7 @@ void LLVoiceWebRTCConnection::OnIceCandidate(const llwebrtc::LLWebRTCIceCandidat
22212227
void LLVoiceWebRTCConnection::processIceUpdates()
22222228
{
22232229
mOutstandingRequests++;
2230+
22242231
LLCoros::getInstance()->launch("LLVoiceWebRTCConnection::processIceUpdatesCoro",
22252232
boost::bind(&LLVoiceWebRTCConnection::processIceUpdatesCoro, this->shared_from_this()));
22262233
}

0 commit comments

Comments
 (0)