From: Mark Spencer <markster@digium.com>
Date: Wed, 28 Jul 2004 20:41:49 +0000 (+0000)
Subject: Somehow matt's patch didn't make it all the way in
X-Git-Tag: 1.0.0-rc2~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baef4818d275a582d0faf1437ed42e0b8204e2cf;p=thirdparty%2Fasterisk.git

Somehow matt's patch didn't make it all the way in


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3530 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channel.c b/channel.c
index 16935f6843..1f3848ae4b 100755
--- a/channel.c
+++ b/channel.c
@@ -2468,7 +2468,7 @@ int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, struct as
 	long elapsed_ms=0, time_left_ms=0;
 	int playit=0, playitagain=1, first_time=1;
 
-	flags = (config->allowdisconnect||config->allowredirect_out ? AST_BRIDGE_DTMF_CHANNEL_0 : 0) + (config->allowredirect_in ? AST_BRIDGE_DTMF_CHANNEL_1 : 0);
+	flags = (config->allowdisconnect_out||config->allowredirect_out ? AST_BRIDGE_DTMF_CHANNEL_0 : 0) + (config->allowdisconnect_in||config->allowredirect_in ? AST_BRIDGE_DTMF_CHANNEL_1 : 0);
 
 	/* timestamp */
 	gettimeofday(&start_time,NULL);