From ac241207a517b21b6ce60bfecce9e174c30f1d0c Mon Sep 17 00:00:00 2001 From: oej Date: Fri, 16 Jun 2006 06:25:26 +0000 Subject: Don't force a busy state that will break channel signalling if the channel already is up. (Reported by Steve Davies in e-mail, waiting for 1.2 approval) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@34433 f38db490-d61c-443f-a65b-d21fe96a405b --- pbx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pbx.c') diff --git a/pbx.c b/pbx.c index 2b4ceea1e..7bbe3bcdd 100644 --- a/pbx.c +++ b/pbx.c @@ -4938,7 +4938,10 @@ static int pbx_builtin_ringing(struct ast_channel *chan, void *data) static int pbx_builtin_busy(struct ast_channel *chan, void *data) { ast_indicate(chan, AST_CONTROL_BUSY); - ast_setstate(chan, AST_STATE_BUSY); + /* Don't change state of an UP channel, just indicate + busy in audio */ + if (chan->_state != AST_STATE_UP) + ast_setstate(chan, AST_STATE_BUSY); wait_for_hangup(chan, data); return -1; } @@ -4949,7 +4952,10 @@ static int pbx_builtin_busy(struct ast_channel *chan, void *data) static int pbx_builtin_congestion(struct ast_channel *chan, void *data) { ast_indicate(chan, AST_CONTROL_CONGESTION); - ast_setstate(chan, AST_STATE_BUSY); + /* Don't change state of an UP channel, just indicate + congestion in audio */ + if (chan->_state != AST_STATE_UP) + ast_setstate(chan, AST_STATE_BUSY); wait_for_hangup(chan, data); return -1; } -- cgit v1.2.3