[asterisk-commits] qwell: branch 1.8 r308010 - in /branches/1.8: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Feb 15 17:34:03 2011
New Revision: 308010

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=308010
Log:
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
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/apps/app_queue.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_queue.c?view=diff&rev=308010&r1=308009&r2=308010
==============================================================================
--- branches/1.8/apps/app_queue.c (original)
+++ branches/1.8/apps/app_queue.c Tue Feb 15 17:34:03 2011
@@ -3719,7 +3719,6 @@
 								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 */