From: Terry Wilson <twilson@digium.com>
Date: Mon, 2 Feb 2009 23:48:06 +0000 (+0000)
Subject: Fix a feature inheritance bug I added after code review
X-Git-Tag: 1.4.24-rc1~93
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a9018e799da4818c24d72fa1eb922d6bda0cb73;p=thirdparty%2Fasterisk.git

Fix a feature inheritance bug I added after code review


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@173066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_features.c b/res/res_features.c
index 2e369659e3..e44937e2c5 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);