| Index: content/browser/renderer_host/media/video_capture_host.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc
|
| index 51e655c846e5ca9c1b6cbf3a85df9206502a5c20..738f3efea71a0003a6fe0104278252c2930a1c69 100644
|
| --- a/content/browser/renderer_host/media/video_capture_host.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_host.cc
|
| @@ -296,11 +296,13 @@ void VideoCaptureHost::DeleteVideoCaptureController(
|
| if (it == controllers_.end())
|
| return;
|
|
|
| - if (it->second) {
|
| - media_stream_manager_->video_capture_manager()->StopCaptureForClient(
|
| - it->second.get(), controller_id, this, on_error);
|
| - }
|
| + const base::WeakPtr<VideoCaptureController> controller = it->second;
|
| controllers_.erase(it);
|
| + if (!controller)
|
| + return;
|
| +
|
| + media_stream_manager_->video_capture_manager()->StopCaptureForClient(
|
| + controller.get(), controller_id, this, on_error);
|
| }
|
|
|
| } // namespace content
|
|
|