From 89f652a6d16e469da674397a8cee9d1071968610 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Wed, 2 Sep 2026 14:19:15 +0300 Subject: #6228 fix setting the default device after a region change Patch contributed by TJ Hecklezz --- indra/llwebrtc/llwebrtc.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/llwebrtc/llwebrtc.cpp b/indra/llwebrtc/llwebrtc.cpp index 5b322d1b5d..b6b205e858 100644 --- a/indra/llwebrtc/llwebrtc.cpp +++ b/indra/llwebrtc/llwebrtc.cpp @@ -702,7 +702,7 @@ void LLWebRTCImpl::workerStartPlayout() { // Only run playout while voice is enabled and there's a connection to // render (running the output device otherwise is heard as a buzz). - if (!mDeviceModule || !mVoiceEnabled || mTuningMode || mDeviceModule->Playing() || mPeerConnections.empty()) + if (!mDeviceModule || !mVoiceEnabled || mTuningMode || mPeerConnections.empty()) { return; } @@ -726,6 +726,16 @@ void LLWebRTCImpl::workerStartPlayout() } } + if (mDeviceModule->Playing()) + { + if (mDeviceModule->GetPlayoutDevice() == playoutDevice) + { + return; + } + + mDeviceModule->StopPlayout(); + } + #if WEBRTC_WIN if (playoutDevice < 0) { -- cgit v1.3