generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed destroy order.

Browse Source 
TBR
Review URL: https://webrtc-codereview.appspot.com/564007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2215 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pwestin@webrtc.org 2012-05-10 15:49:45 +00:00
parent fd3fef514b
commit c309c7c52b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video_engine/vie_channel_manager.cc
View File

@ -223,6 +223,7 @@ int ViEChannelManager::DeleteChannel(int channel_id) {
group = NULL; // Prevent group from being deleted. group = NULL; // Prevent group from being deleted.
} }
} }
delete vie_channel;
// Leave the write critsect before deleting the objects. // Leave the write critsect before deleting the objects.
// Deleting a channel can cause other objects, such as renderers, to be // Deleting a channel can cause other objects, such as renderers, to be
// deleted, which might take time. // deleted, which might take time.
@ -242,7 +243,6 @@ int ViEChannelManager::DeleteChannel(int channel_id) {
channel_id); channel_id);
delete group; delete group;
} }
delete vie_channel;
WEBRTC_TRACE(kTraceInfo, kTraceVideo, ViEId(engine_id_), WEBRTC_TRACE(kTraceInfo, kTraceVideo, ViEId(engine_id_),
"%s Channel %d deleted", __FUNCTION__, channel_id); "%s Channel %d deleted", __FUNCTION__, channel_id);
return 0; return 0;