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

Revert 2215 - Fixed destroy order.

Browse Source 
A series of CL:s by Patrik W. is breaking the auto-test. It started with CL 2211, but the later CL:s seems dependent on another. So I decided to go in reverse order and revert all of them.

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

TBR=pwestin@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/562008

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2222 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
turaj@webrtc.org 2012-05-10 22:53:33 +00:00
parent f448ccd16c
commit f02ee061ab
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,7 +223,6 @@ 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.
@ -243,6 +242,7 @@ 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;