zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebase webrtc/base 6163:6216 (svn diff -r 6163:6216 http://webrtc.googlecode.com/svn/trunk/talk/base, apply diff manually)

Browse Source 
BUG=3379
TBR=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/17619004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6217 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
henrike@webrtc.org
2014-05-21 20:42:17 +00:00
parent f9f1bfbdae
commit 99b4162ccf
6 changed files with 54 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/base/thread.cc
View File

@ -140,8 +140,7 @@ Thread::Thread(SocketServer* ss)
Thread::~Thread() {
Stop();
if (active_)
Clear(NULL);
Clear(NULL);
}
bool Thread::SleepMs(int milliseconds) {
@ -386,7 +385,6 @@ void Thread::Send(MessageHandler *phandler, uint32 id, MessageData *pdata) {
bool ready = false;
{
CritScope cs(&crit_);
EnsureActive();
_SendMessage smsg;
smsg.thread = current_thread;
smsg.msg = msg;