]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix a feature inheritance bug I added after code review
authorTerry Wilson <twilson@digium.com>
Mon, 2 Feb 2009 23:48:06 +0000 (23:48 +0000)
committerTerry Wilson <twilson@digium.com>
Mon, 2 Feb 2009 23:48:06 +0000 (23:48 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@173066 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_features.c

index 2e369659e31cba814a3741feb91b4768e2fcdf73..e44937e2c5b036b89aec4564656f720810edf28b 100644 (file)
@@ -1524,6 +1524,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);