From 4c07cb1c609484bbcc2a81767d8f3945d78eabf4 Mon Sep 17 00:00:00 2001
From: Olle Johansson <oej@edvina.net>
Date: Fri, 16 Jun 2006 06:25:26 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@34433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
pbx.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/pbx.c b/pbx.c
index 2b4ceea1e8..7bbe3bcdd1 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;
}
--
GitLab