[asterisk-commits] dvossel: branch 1.6.2 r247737 - in /branches/1.6.2: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Feb 18 14:59:38 2010
New Revision: 247737

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247737
Log:
Merged revisions 247736 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r247736 | dvossel | 2010-02-18 14:58:41 -0600 (Thu, 18 Feb 2010) | 7 lines
  
  fixes Queue with C option crash
  
  (closes issue #16475)
  Reported by: okrief
  Patches:
        queue_crash.diff uploaded by dvossel (license 671)
........

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

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

Modified: branches/1.6.2/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_queue.c?view=diff&rev=247737&r1=247736&r2=247737
==============================================================================
--- branches/1.6.2/apps/app_queue.c (original)
+++ branches/1.6.2/apps/app_queue.c Thu Feb 18 14:59:38 2010
@@ -2304,7 +2304,7 @@
 	while (outgoing) {
 		/* If someone else answered the call we should indicate this in the CANCEL */
 		/* Hangup any existing lines we have open */
-		if (outgoing->chan && (outgoing->chan != exception || cancel_answered_elsewhere)) {
+		if (outgoing->chan && (outgoing->chan != exception)) {
 			if (exception || cancel_answered_elsewhere)
 				ast_set_flag(outgoing->chan, AST_FLAG_ANSWERED_ELSEWHERE);
 			ast_hangup(outgoing->chan);