diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2013-03-01 03:46:45 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2013-03-01 03:46:45 +0000 |
| commit | 0ea79636890aa26ad47dd06962cb1e668e3cfc30 (patch) | |
| tree | cfddf03a07957f9f2fa62398a32eb7d924809844 /pjlib | |
| parent | 4a841f08f9eda7a9649e15f8ce2afd2d5ff9b9b4 (diff) | |
Re 1394 and re #1531: backported to 1.x
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@4410 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib')
| -rw-r--r-- | pjlib/src/pj/os_core_win32.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pjlib/src/pj/os_core_win32.c b/pjlib/src/pj/os_core_win32.c index 55d7b1b9..5072c4ce 100644 --- a/pjlib/src/pj/os_core_win32.c +++ b/pjlib/src/pj/os_core_win32.c @@ -579,6 +579,9 @@ PJ_DEF(pj_status_t) pj_thread_join(pj_thread_t *p) PJ_CHECK_STACK(); 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)); rc = WaitForSingleObject(rec->hthread, INFINITE); |