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

diff --git a/pbx.c b/pbx.c
index 2b4ceea1e8b239d4c4b42fe05f4743ccab22eda0..7bbe3bcdd1d4028de5545d5220d561e7589f143c 100644 (file)
--- 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;
 }