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

Clear out observers when terminating a connection

master
Roxie Linden 2024-03-19 17:05:56 -07:00
parent 5bc92b8031
commit 0e2fc4d35e
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
autobuild.xml
View File

@ -2901,15 +2901,29 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>8b0191fae0860782a3e79b886364129c433cfd6b</string>
<string>a49fb3bb8aaf8325e7c6c4b6036db3da16afa2c9</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/3p-webrtc-build/releases/assets/157215889</string>
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.53/webrtc-m114.5735.08.53.8337236647-darwin64-8337236647.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
</map>
<key>linux64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>598baa054f63624a8e16883541c1f3dc7aa15a8a</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.53/webrtc-m114.5735.08.53.8337236647-linux64-8337236647.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
</map>
<key>windows64</key>
<map>
<key>archive</key>
@ -2917,11 +2931,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>64eccac933cee532dc065d9f9729a21d8347aae4</string>
<string>59d5f2e40612ab7b0b1a5da8ba288f48d5979216</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/3p-webrtc-build/releases/assets/157215892</string>
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.53/webrtc-m114.5735.08.53.8337236647-windows64-8337236647.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
@ -2934,7 +2948,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>vcs_url</key>
<string>https://github.com/secondlife/3p-webrtc-build</string>
<key>version</key>
<string>m114.5735.08.52.8319849783</string>
<string>m114.5735.08.53.8337236647</string>
</map>
<key>xmlrpc-epi</key>
<map>

8
indra/llwebrtc/llwebrtc.cpp
View File

@ -1135,14 +1135,6 @@ void LLWebRTCPeerConnectionImpl::OnStateChange()
break;
case webrtc::DataChannelInterface::kClosed:
RTC_LOG(LS_INFO) << __FUNCTION__ << " Data Channel State closed";
// if the data channel is up, we need to shut it down, holding off
// on termination of the peer connection until it's been closed.
if (mClosing)
{
// a close was requested, and the data channel has closed,
// so go ahead and call shutdownConnection again to clean up.
shutdownConnection();
}
break;
default:
break;