diff options
author | Olle Johansson <oej@edvina.net> | 2006-06-16 06:25:26 +0000 |
---|---|---|
committer | Olle Johansson <oej@edvina.net> | 2006-06-16 06:25:26 +0000 |
commit | 4c07cb1c609484bbcc2a81767d8f3945d78eabf4 (patch) | |
tree | 41cdd60a1dd856b353e485ec9d1c7bc183487333 /pbx.c | |
parent | 9ebb7c35a2e6225e4aab4a1b2281736516da4fe8 (diff) |
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
Diffstat (limited to 'pbx.c')
-rw-r--r-- | pbx.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -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; } |