diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-03 00:01:13 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-03 00:01:13 +0000 |
| commit | 76a58ecbfc5bd1e1056b4bf95916652b432585af (patch) | |
| tree | 3b5cf15d57eea3201a63fe8ac57edbda5034f356 /main/features.c | |
| parent | d45c4ad2db83a1153e5cf03de3ceafb57f4574eb (diff) | |
Merged revisions 173067 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r173067 | twilson | 2009-02-02 17:57:25 -0600 (Mon, 02 Feb 2009) | 9 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@173069 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c index f6024f19a..66f4b57d2 100644 --- a/main/features.c +++ b/main/features.c @@ -2257,6 +2257,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); |