Changeset 3855 for pjproject/trunk/pjlib/src/pj/os_core_win32.c

Timestamp:

Oct 25, 2011 12:14:12 PM (13 years ago)

Author:

nanang

Message:

Re #1394: Ignore thread join if called from the same thread, it will cause the thread blocks forever.

File:

• pjproject/trunk/pjlib/src/pj/os_core_win32.c (modified) (1 diff)

pjproject/trunk/pjlib/src/pj/os_core_win32.c

@@ -560 +560 @@
     PJ_ASSERT_RETURN(p, PJ_EINVAL);
 
+    if (p == pj_thread_this())
+        return PJ_ECANCELLED;
+
     PJ_LOG(6, (pj_thread_this()->obj_name, "Joining thread %s", p->obj_name));