[asterisk-commits] twilson: branch 1.6.0 r173068 - in /branches/1.6.0: ./ main/features.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Feb  2 17:59:46 2009
New Revision: 173068

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=173068
Log:
Merged revisions 173067 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r173067 | twilson | 2009-02-02 17:57:25 -0600 (Mon, 02 Feb 2009) | 9 lines
  
  Merged revisions 173066 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r173066 | twilson | 2009-02-02 17:48:06 -0600 (Mon, 02 Feb 2009) | 2 lines
    
    Fix a feature inheritance bug I added after code review
  ........
................

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

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

Modified: branches/1.6.0/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/features.c?view=diff&rev=173068&r1=173067&r2=173068
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Mon Feb  2 17:59:46 2009
@@ -2057,6 +2057,10 @@
 		ast_channel_lock(caller);
 		ast_channel_datastore_add(caller, ds_caller_features);
 		ast_channel_unlock(caller);
+	} else {
+		/* If we don't return here, then when we do a builtin_atxfer we will copy the disconnect
+		 * flags over from the atxfer to the caller */
+		return;
 	}
 
 	ast_channel_lock(callee);