From: Terry Wilson <twilson@digium.com>
Date: Mon, 2 Feb 2009 23:57:25 +0000 (+0000)
Subject: Merged revisions 173066 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~306
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34be09bf5cf2ca54c844e62b74c09fa0e7a582b2;p=thirdparty%2Fasterisk.git

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 6ad1c12a9b..a7be7a648b 100644
--- 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);