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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@173067 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/features.c b/main/features.c
index 6ad1c12..a7be7a6 100644 (file)
--- a/main/features.c
+++ b/main/features.c
@@ -2326,6 +2326,10 @@ static void add_features_datastores(struct ast_channel *caller, struct ast_chann
                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);