From d8aed6b321df136a98f2c3c69cf5391103831b88 Mon Sep 17 00:00:00 2001 From: "asapersson@webrtc.org" Date: Wed, 3 Dec 2014 12:37:47 +0000 Subject: [PATCH] Verify that cpu_monitor exists before calling Stop(). R=pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/25259004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7795 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideoengine.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/talk/media/webrtc/webrtcvideoengine.cc b/talk/media/webrtc/webrtcvideoengine.cc index 32c80b09f..bcdaf7acd 100644 --- a/talk/media/webrtc/webrtcvideoengine.cc +++ b/talk/media/webrtc/webrtcvideoengine.cc @@ -1178,7 +1178,9 @@ void WebRtcVideoEngine::Terminate() { LOG_RTCERR0(SetVoiceEngine); } - cpu_monitor_->Stop(); + if (cpu_monitor_.get()) { + cpu_monitor_->Stop(); + } } int WebRtcVideoEngine::GetCapabilities() {