diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-15 23:34:27 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-02-15 23:34:27 +0000 |
| commit | e674d7dd1099c2abd826a0623c1755cda034e06f (patch) | |
| tree | ea604dd4961d06ac1c48490ba262e3a42d719e35 | |
| parent | 18f4d9ca6b4d299973cc9a622948f096562c6b4d (diff) | |
Merged revisions 308010 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r308010 | qwell | 2011-02-15 17:34:03 -0600 (Tue, 15 Feb 2011) | 24 lines
Merged revisions 308007 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r308007 | qwell | 2011-02-15 17:33:24 -0600 (Tue, 15 Feb 2011) | 17 lines
Merged revisions 308002 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r308002 | qwell | 2011-02-15 17:32:20 -0600 (Tue, 15 Feb 2011) | 10 lines
Fix regression that changed behavior of queues when ringing a queue member.
This reverts r298596, which was to fix a highly bizarre and contrived issue
with a queue member that called into his own queue being transferred back
into his own queue. I couldn't reproduce that issue in any way. I think one
of the other recent transfer fixes actually fixed this.
(closes issue #18747)
Reported by: vrban
........
................
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@308013 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_queue.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index f511bfc81..5c348b752 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -3719,7 +3719,6 @@ static struct callattempt *wait_for_answer(struct queue_ent *qe, struct callatte ast_moh_stop(qe->chan); ast_indicate(qe->chan, AST_CONTROL_RINGING); } - ast_indicate(in, AST_CONTROL_RINGING); break; case AST_CONTROL_OFFHOOK: /* Ignore going off hook */ |