From 6aa5e4f230b6a7138c20a69c341cd61de470446e Mon Sep 17 00:00:00 2001
From: Terry Wilson <twilson@digium.com>
Date: Mon, 2 Feb 2009 23:59:46 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@173068 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 main/features.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main/features.c b/main/features.c
index c25d924dc3..9e208e55ab 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);