From c309c7c52b873d7f0e3ab25e64a39c3f81ce1d9b Mon Sep 17 00:00:00 2001 From: "pwestin@webrtc.org" Date: Thu, 10 May 2012 15:49:45 +0000 Subject: [PATCH] Fixed destroy order. TBR Review URL: https://webrtc-codereview.appspot.com/564007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2215 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/video_engine/vie_channel_manager.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_engine/vie_channel_manager.cc b/src/video_engine/vie_channel_manager.cc index 2c6f6f7191..3fbaff8c9d 100644 --- a/src/video_engine/vie_channel_manager.cc +++ b/src/video_engine/vie_channel_manager.cc @@ -223,6 +223,7 @@ int ViEChannelManager::DeleteChannel(int channel_id) { group = NULL; // Prevent group from being deleted. } } + delete vie_channel; // Leave the write critsect before deleting the objects. // Deleting a channel can cause other objects, such as renderers, to be // deleted, which might take time. @@ -242,7 +243,6 @@ int ViEChannelManager::DeleteChannel(int channel_id) { channel_id); delete group; } - delete vie_channel; WEBRTC_TRACE(kTraceInfo, kTraceVideo, ViEId(engine_id_), "%s Channel %d deleted", __FUNCTION__, channel_id); return 0;