Bug 1264416 - RollbackIceRestart wasn't resetting mIceRestartState. r=drno draft
authorMichael Froman <mfroman@mozilla.com>
Thu, 21 Apr 2016 00:35:57 -0500
changeset 354531 d771d9a6898cb0431bf5b0850ec2b003c91675b6
parent 354481 4feb4dd910a5a2d3061dbdd376a80975206819c6
child 519034 c2bcdfdb206a1e2793fbdbb3b93a520973f840bc
push id16113
push usermfroman@nostrum.com
push dateThu, 21 Apr 2016 05:40:17 +0000
reviewersdrno
bugs1264416
milestone48.0a1
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
@@ -695,16 +695,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