diff options
author | Liong Sauw Ming <ming@teluu.com> | 2011-10-31 10:31:23 +0000 |
---|---|---|
committer | Liong Sauw Ming <ming@teluu.com> | 2011-10-31 10:31:23 +0000 |
commit | 5d2066e0c3368cce23090e842c407a35bc351a83 (patch) | |
tree | c188d02e9322edef6defc9161d8cb26a736108ba /pjsip/src/pjsua-lib/pjsua_core.c | |
parent | d63fe414b41e56ccdcb45f6924e60cdc8a2ad3a4 (diff) |
Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk
* Backport of r3833:r3877
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3878 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip/src/pjsua-lib/pjsua_core.c')
-rw-r--r-- | pjsip/src/pjsua-lib/pjsua_core.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pjsip/src/pjsua-lib/pjsua_core.c b/pjsip/src/pjsua-lib/pjsua_core.c index 52054226..6a80380c 100644 --- a/pjsip/src/pjsua-lib/pjsua_core.c +++ b/pjsip/src/pjsua-lib/pjsua_core.c @@ -1321,8 +1321,12 @@ pj_status_t resolve_stun_server(pj_bool_t wait) * result. */ if (wait) { - while (pjsua_var.stun_status == PJ_EPENDING) - pjsua_handle_events(10); + while (pjsua_var.stun_status == PJ_EPENDING) { + if (pjsua_var.thread[0] == NULL) + pjsua_handle_events(10); + else + pj_thread_sleep(10); + } } } |