[asterisk-commits] twilson: trunk r173067 - in /trunk: ./ main/features.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Feb  2 17:57:25 2009
New Revision: 173067

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=173067
Log:
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:
    trunk/   (props changed)
    trunk/main/features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/features.c?view=diff&rev=173067&r1=173066&r2=173067
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Mon Feb  2 17:57:25 2009
@@ -2326,6 +2326,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);