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
This commit is contained in:
pwestin@webrtc.org 2012-05-10 15:49:45 +00:00
parent fd3fef514b
commit c309c7c52b

View File

@ -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;