[asterisk-commits] twilson: branch 1.4 r173066 - /branches/1.4/res/res_features.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Feb  2 17:48:06 2009
New Revision: 173066

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=173066
Log:
Fix a feature inheritance bug I added after code review

Modified:
    branches/1.4/res/res_features.c

Modified: branches/1.4/res/res_features.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/res/res_features.c?view=diff&rev=173066&r1=173065&r2=173066
==============================================================================
--- branches/1.4/res/res_features.c (original)
+++ branches/1.4/res/res_features.c Mon Feb  2 17:48:06 2009
@@ -1524,6 +1524,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);