Changeset 4410 for pjproject/branches/1.x/pjlib/src/pj/os_core_win32.c

Timestamp:

Mar 1, 2013 3:46:45 AM (11 years ago)

Author:

nanang

Message:

Re 1394 and re #1531: backported to 1.x

Location:

pjproject/branches/1.x

Files:

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

pjproject/branches/1.x/pjlib/src/pj/os_core_win32.c

@@ -580 +580 @@
     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));