From 7bdfff35037d28f1f41084525fe601ea4878e473 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Wed, 29 May 2013 13:58:11 +0000 Subject: [PATCH] Remove assert for aborting FrameGeneratorCapturer. BUG= TBR=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1586004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4133 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_engine/test/common/frame_generator_capturer.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/webrtc/video_engine/test/common/frame_generator_capturer.cc b/webrtc/video_engine/test/common/frame_generator_capturer.cc index 4b481b992d..fd44dd8fd8 100644 --- a/webrtc/video_engine/test/common/frame_generator_capturer.cc +++ b/webrtc/video_engine/test/common/frame_generator_capturer.cc @@ -57,11 +57,10 @@ FrameGeneratorCapturer::~FrameGeneratorCapturer() { if (thread_ != NULL) { if (!thread_->Stop()) { - // TODO(pbos): Log a warning instead. - assert(!"Couldn't stop FrameGeneratorCapturer thread!"); + // TODO(pbos): Log a warning. This will leak a thread. + } else { + delete thread_; } - - delete thread_; } }