[svn-commits] kmoore: branch 12 r418810 - /branches/12/main/bridge_channel.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Thu Jul 17 09:27:40 2014
New Revision: 418810

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418810
Log:
TEST_FRAMEWORK: Fix threewaytransfer reporting

Ensure that three-way transfers can be reported even if featuremap is
non-NULL.

Modified:
    branches/12/main/bridge_channel.c

Modified: branches/12/main/bridge_channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/bridge_channel.c?view=diff&rev=418810&r1=418809&r2=418810
==============================================================================
--- branches/12/main/bridge_channel.c (original)
+++ branches/12/main/bridge_channel.c Thu Jul 17 09:27:40 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";
 		}