| Index: webrtc/base/thread.cc
|
| diff --git a/webrtc/base/thread.cc b/webrtc/base/thread.cc
|
| index 4197d28175a05037f5ad953aba64d6b72ae62bef..cda4ba475c8b6bfebd80fe994c518f4b55d3e666 100644
|
| --- a/webrtc/base/thread.cc
|
| +++ b/webrtc/base/thread.cc
|
| @@ -138,8 +138,8 @@ Thread::ScopedDisallowBlockingCalls::~ScopedDisallowBlockingCalls() {
|
| thread_->SetAllowBlockingCalls(previous_state_);
|
| }
|
|
|
| -Thread::Thread(SocketServer* ss)
|
| - : MessageQueue(ss),
|
| +Thread::Thread(SocketServer* ss, bool init_queue)
|
| + : MessageQueue(ss, false),
|
| running_(true, false),
|
| #if defined(WEBRTC_WIN)
|
| thread_(NULL),
|
| @@ -148,11 +148,14 @@ Thread::Thread(SocketServer* ss)
|
| owned_(true),
|
| blocking_calls_allowed_(true) {
|
| SetName("Thread", this); // default name
|
| + if (init_queue) {
|
| + DoInit();
|
| + }
|
| }
|
|
|
| Thread::~Thread() {
|
| Stop();
|
| - Clear(NULL);
|
| + DoDestroy();
|
| }
|
|
|
| bool Thread::SleepMs(int milliseconds) {
|
|
|