diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index d0ed46d95d..a0a8d81fb2 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -1661,10 +1661,12 @@ bool WebRtcVideoMediaChannel::Init() { } WebRtcVideoMediaChannel::~WebRtcVideoMediaChannel() { - const bool send = false; - SetSend(send); - const bool render = false; - SetRender(render); + Terminate(); +} + +void WebRtcVideoMediaChannel::Terminate() { + SetSend(false); + SetRender(false); while (!send_channels_.empty()) { if (!DeleteSendChannel(send_channels_.begin()->first)) { diff --git a/talk/media/webrtc/webrtcvideoengine.h b/talk/media/webrtc/webrtcvideoengine.h index 2966511c01..eee82c8f73 100644 --- a/talk/media/webrtc/webrtcvideoengine.h +++ b/talk/media/webrtc/webrtcvideoengine.h @@ -330,6 +330,7 @@ class WebRtcVideoMediaChannel : public rtc::MessageHandler, virtual void OnMessage(rtc::Message* msg) OVERRIDE; protected: + void Terminate(); int GetLastEngineError() { return engine()->GetLastEngineError(); } // webrtc::Transport: