Merge "logger: Prevent duplicate dynamic channels from being added."
authorJoshua Colp <jcolp@digium.com>
Fri, 25 Sep 2015 15:57:40 +0000 (10:57 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 25 Sep 2015 15:57:40 +0000 (10:57 -0500)
main/channel.c

index 25badf3..3e2636f 100644 (file)
@@ -4487,7 +4487,7 @@ int ast_indicate_data(struct ast_channel *chan, int _condition,
 
        /* Don't bother if the channel is about to go away, anyway. */
        if ((ast_test_flag(ast_channel_flags(chan), AST_FLAG_ZOMBIE)
-                       || ast_check_hangup(chan))
+                       || (ast_check_hangup(chan) && !ast_channel_is_leaving_bridge(chan)))
                && condition != AST_CONTROL_MASQUERADE_NOTIFY) {
                res = -1;
                goto indicate_cleanup;