From: Kinsey Moore Date: Thu, 17 Jul 2014 14:28:16 +0000 (+0000) Subject: TEST_FRAMEWORK: Fix threewaytransfer reporting X-Git-Tag: 13.0.0-beta1~114 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd6c7744568e07124bd2cbf01d57eb0e15c82013;p=thirdparty%2Fasterisk.git 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 --- diff --git a/main/bridge_channel.c b/main/bridge_channel.c index 0948928eae..93cbed22d8 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"; }