diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-02 23:59:46 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-02 23:59:46 +0000 |
| commit | c42757844ab85c598b76fff5243b83312c9640c3 (patch) | |
| tree | 4c3a4502ca068680aa6fac631f48933e8c4cc156 /main | |
| parent | cbc5ce91c58f282ab8ef2128e40dd53fdecc103e (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.0@173068 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -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 c25d924dc..9e208e55a 100644 --- a/main/features.c +++ b/main/features.c @@ -2057,6 +2057,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); |