[svn-commits] dvossel: branch 1.6.2 r271832 - in /branches/1.6.2: ./ main/features.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue Jun 22 10:49:41 2010
New Revision: 271832

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

........
  r271831 | dvossel | 2010-06-22 10:46:22 -0500 (Tue, 22 Jun 2010) | 10 lines
  
  fixes attended transfer behavior when both transferee and transferer hung up
  
  If both the transferer and transferee of a attended transfer hangup before
  the new channel picks up, the new channel should be hung up as well as it
  has no endpoint to talk to.  This mirrors the expected behavior used in 1.4. 
  
  (closes issue #17444)
  Reported by: corruptor
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/features.c

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

Modified: branches/1.6.2/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/features.c?view=diff&rev=271832&r1=271831&r2=271832
==============================================================================
--- branches/1.6.2/main/features.c (original)
+++ branches/1.6.2/main/features.c Tue Jun 22 10:49:41 2010
@@ -1688,6 +1688,11 @@
 	} else {
 		/* Transferee hung up */
 		finishup(transferee);
+		/* At this point both the transferer transferee have hungup,
+		 * so if newchan is up, hang it up as it has no one to talk to */
+		if (newchan) {
+			ast_hangup(newchan);
+		}
 		return -1;
 	}
 }