summaryrefslogtreecommitdiff
path: root/main/bridge_channel.c
diff options
context:
space:
mode:
authorKinsey Moore <kmoore@digium.com>2014-07-17 14:28:16 +0000
committerKinsey Moore <kmoore@digium.com>2014-07-17 14:28:16 +0000
commitcd6c7744568e07124bd2cbf01d57eb0e15c82013 (patch)
tree8b1609aeae0b7c0335c0174fe70a7ecdd9b65e13 /main/bridge_channel.c
parent7b7132710bdbabdb484be222b3f7df2f175622f0 (diff)
TEST_FRAMEWORK: Fix threewaytransfer reporting
Ensure that three-way transfers can be reported even if featuremap is non-NULL. ........ Merged revisions 418810 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418811 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/bridge_channel.c')
-rw-r--r--main/bridge_channel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/bridge_channel.c b/main/bridge_channel.c
index 0948928ea..93cbed22d 100644
--- a/main/bridge_channel.c
+++ b/main/bridge_channel.c
@@ -1478,7 +1478,8 @@ static void testsuite_notify_feature_success(struct ast_channel *chan, const cha
} else if (!strcmp(dtmf, featuremap->parkcall)) {
feature = "parkcall";
}
- } else if (xfer) {
+ }
+ if (xfer) {
if (!strcmp(dtmf, xfer->atxferthreeway)) {
feature = "atxferthreeway";
}