[svn-commits] kmoore: trunk r418811 - in /trunk: ./ main/bridge_channel.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Thu Jul 17 09:28:16 2014
New Revision: 418811

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418811
Log:
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

Modified:
    trunk/   (props changed)
    trunk/main/bridge_channel.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/main/bridge_channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/bridge_channel.c?view=diff&rev=418811&r1=418810&r2=418811
==============================================================================
--- trunk/main/bridge_channel.c (original)
+++ trunk/main/bridge_channel.c Thu Jul 17 09:28:16 2014
@@ -1478,7 +1478,8 @@
 		} else if (!strcmp(dtmf, featuremap->parkcall)) {
 			feature = "parkcall";
 		}
-	} else if (xfer) {
+	}
+	if (xfer) {
 		if (!strcmp(dtmf, xfer->atxferthreeway)) {
 			feature = "atxferthreeway";
 		}