]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
The bridge uniqueid is available for softmix destructor.
authorRichard Mudgett <rmudgett@digium.com>
Sat, 8 Jun 2013 02:10:47 +0000 (02:10 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Sat, 8 Jun 2013 02:10:47 +0000 (02:10 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@390956 65c4cc65-6c06-0410-ace0-fbb531ad65f3

bridges/bridge_softmix.c

index c1b3618c990d0204f1d607b0c6694c9b816a9362..2a65e0f86f4541193dd5f522d1c35f1a2a945351 100644 (file)
@@ -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);
        }