Bug 1264416 - RollbackIceRestart wasn't resetting mIceRestartState. r=drno
authorMichael Froman <mfroman@mozilla.com>
Thu, 21 Apr 2016 00:35:57 -0500
changeset 332586 2195629bf525893e0576b0f6af0f04159459da9e
parent 332585 35edab8d84dbe447525af059eb79f528cd2db24a
child 332587 fbad795be936e54fdc6f5135ccab4f7bd238b798
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdrno
bugs1264416
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1264416 - RollbackIceRestart wasn't resetting mIceRestartState. r=drno MozReview-Commit-ID: BPmHKOCt9Im
media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
@@ -691,16 +691,18 @@ PeerConnectionMedia::RollbackIceRestart(
     return;
   }
 
   RUN_ON_THREAD(GetSTSThread(),
                 WrapRunnable(
                     RefPtr<PeerConnectionMedia>(this),
                     &PeerConnectionMedia::RollbackIceRestart_s),
                 NS_DISPATCH_NORMAL);
+
+  mIceRestartState = ICE_RESTART_NONE;
 }
 
 void
 PeerConnectionMedia::RollbackIceRestart_s()
 {
   ASSERT_ON_THREAD(mSTSThread);
 
   // hold the restart context so we can disconnect signals