diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-05-11 12:57:13 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-05-11 12:57:13 -0500 |
| commit | 0863ccee09fe59fce425c935078161f9c4e10bda (patch) | |
| tree | bbc6eea604ae521a81d94fdd30e374d14712ddcc /res | |
| parent | 09e22d7d6ca74dff27421152e1e314a7817a931f (diff) | |
| parent | 3b0ce5169d123312e4b4ac5a65b23325a59ba2a7 (diff) | |
Merge "res_pjsip_outbound_publish: Won't unload if condition wait times out"
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 f13af10de..0f0e290af 100644 --- a/res/res_pjsip_outbound_publish.c +++ b/res/res_pjsip_outbound_publish.c @@ -1221,7 +1221,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); |