Don't double-add data channel observer

roxanneskelly · roxanneskelly · commit ed6ebed0816e · 2024-10-20T22:52:35.000-07:00
diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp
@@ -3045,7 +3045,9 @@ void LLVoiceWebRTCConnection::OnDataChannelReady(llwebrtc::LLWebRTCDataInterface
                 return;
             }
 
-            if (data_interface)
+            // OnDataChannelReady may be called multiple times in a single connection attempt
+            // so don't double-set the observer.
+            if (!mWebRTCDataInterface && data_interface)
             {
                 mWebRTCDataInterface = data_interface;
                 mWebRTCDataInterface->setDataObserver(this);

Original file line number	Diff line number	Diff line change
`@@ -3045,7 +3045,9 @@ void LLVoiceWebRTCConnection::OnDataChannelReady(llwebrtc::LLWebRTCDataInterface`
`3045`	`3045`	`return;`
`3046`	`3046`	`}`
`3047`	`3047`
`3048`		`- if (data_interface)`
	`3048`	`+ // OnDataChannelReady may be called multiple times in a single connection attempt`
	`3049`	`+ // so don't double-set the observer.`
	`3050`	`+ if (!mWebRTCDataInterface && data_interface)`
`3049`	`3051`	`{`
`3050`	`3052`	`mWebRTCDataInterface = data_interface;`
`3051`	`3053`	`mWebRTCDataInterface->setDataObserver(this);`