diff --git a/talk/media/base/capturemanager.cc b/talk/media/base/capturemanager.cc index 95612187fa..d3b3f82b55 100644 --- a/talk/media/base/capturemanager.cc +++ b/talk/media/base/capturemanager.cc @@ -375,8 +375,10 @@ void CaptureManager::UnregisterVideoCapturer( // for the CaptureManager it doesn't matter as it will no longer receive any // frames from the VideoCapturer. SignalCapturerStateChange.stop(video_capturer->SignalStateChange); - video_capturer->Stop(); - SignalCapturerStateChange(video_capturer, CS_STOPPED); + if (video_capturer->IsRunning()) { + video_capturer->Stop(); + SignalCapturerStateChange(video_capturer, CS_STOPPED); + } } bool CaptureManager::StartWithBestCaptureFormat(