diff options
Diffstat (limited to 'base/thread.cc')
-rw-r--r-- | base/thread.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/base/thread.cc b/base/thread.cc index 40257ab8..aa2442f3 100644 --- a/base/thread.cc +++ b/base/thread.cc @@ -312,10 +312,13 @@ void Thread::SafeWrapCurrent() { } void Thread::Join() { - AssertBlockingIsAllowedOnCurrentThread(); - if (running()) { ASSERT(!IsCurrent()); + if (Current() && !Current()->blocking_calls_allowed_) { + LOG(LS_WARNING) << "Waiting for the thread to join, " + << "but blocking calls have been disallowed"; + } + #if defined(WEBRTC_WIN) ASSERT(thread_ != NULL); WaitForSingleObject(thread_, INFINITE); |