diff options
author | Joshua Colp <jcolp@digium.com> | 2016-05-18 19:17:43 -0500 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-05-18 19:17:43 -0500 |
commit | 4509aa890fdcfe3f347bc30f6f6fca6c350b8686 (patch) | |
tree | 325f2a98b5dd9c72d2b579e2d4cc02cabe46f419 /res | |
parent | 480b8cda306c2c13e7b5f33d17a37077b3ad22df (diff) | |
parent | 4752ef02e02dfcb1b1ec38d154eb9bc42736df3c (diff) |
Merge "res_pjsip_outbound_publish: Won't unload if condition wait times out" into 13
Diffstat (limited to 'res')
-rw-r--r-- | res/res_pjsip_outbound_publish.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_pjsip_outbound_publish.c b/res/res_pjsip_outbound_publish.c index 60f9bbb17..141cdef62 100644 --- a/res/res_pjsip_outbound_publish.c +++ b/res/res_pjsip_outbound_publish.c @@ -1200,7 +1200,7 @@ static int unload_module(void) /* wait for items to unpublish */ ast_verb(5, "Waiting to complete unpublishing task(s)\n"); - while (unloading.count) { + while (unloading.count && !res) { res = ast_cond_timedwait(&unloading.cond, &unloading.lock, &end); } ast_mutex_unlock(&unloading.lock); |