From b48545a5641c323ecb9389bb8f0f521af3d410f5 Mon Sep 17 00:00:00 2001 From: jpeeler Date: Mon, 27 Jul 2009 01:21:54 +0000 Subject: Merged revisions 208924 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r208924 | jpeeler | 2009-07-26 20:20:37 -0500 (Sun, 26 Jul 2009) | 9 lines Merged revisions 208923 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r208923 | jpeeler | 2009-07-26 20:18:31 -0500 (Sun, 26 Jul 2009) | 2 lines Fix logic errors from 208746 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@208925 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_iax2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'channels') diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 1627b4e79..4ce92f3d3 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4013,7 +4013,7 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha return AST_BRIDGE_FAILED; } /* Put them in native bridge mode */ - if ((!flags) & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) { + if (!(flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1))) { iaxs[callno0]->bridgecallno = callno1; iaxs[callno1]->bridgecallno = callno0; } -- cgit v1.2.3