aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-02-02 23:48:06 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-02-02 23:48:06 +0000
commitd50a938168c17ca3db3ae0367bb3306395d62fe7 (patch)
tree05c83cb89bc6b02eb0d9c3e805ec86f0dd4a0b77 /res
parenta99de14a4720d60264c03964da893b951061e810 (diff)
Fix a feature inheritance bug I added after code review
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@173066 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_features.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/res/res_features.c b/res/res_features.c
index 2e369659e..e44937e2c 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -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);