diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-27 01:22:31 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-27 01:22:31 +0000 |
| commit | 9bf377379c617fb04180d108360c9df50ee8c0d4 (patch) | |
| tree | 877ae228e081022814bf150500d32c57bebb77fd /channels | |
| parent | dd3ab12213499cf5fe3657cd9e7f6e06d58d9271 (diff) | |
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.1@208926 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 0821b4041..44f255392 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4110,7 +4110,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; } |