diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-06-08 02:10:47 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-06-08 02:10:47 +0000 |
| commit | 9895fecf580334ec22ab9edf56a6986c09a09150 (patch) | |
| tree | e5d275d0878f8831acacca8406d16d2414e93b30 /bridges | |
| parent | 6a013e3a07afd95ee9701ee6be30e955d8cf9af0 (diff) | |
The bridge uniqueid is available for softmix destructor.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@390956 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_softmix.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index c1b3618c9..2a65e0f86 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -1083,11 +1083,7 @@ static void softmix_bridge_destroy(struct ast_bridge *bridge) softmix_data->thread = AST_PTHREADT_NULL; ast_mutex_unlock(&softmix_data->lock); if (thread != AST_PTHREADT_NULL) { - /* - * We cannot use bridge->uniqueid in the message because the - * bridge pointer is likely a dummy from a deferred destruction. - */ - ast_debug(1, "Waiting for mixing thread to die.\n"); + ast_debug(1, "Bridge %s: Waiting for mixing thread to die.\n", bridge->uniqueid); pthread_join(thread, NULL); } |