[svn-commits] russell: branch 1.2 r59886 - /branches/1.2/app.c

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Apr  3 12:58:19 2007
New Revision: 59886

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59886
Log:
When doing a built-in blind or attended transfer, restore the ability to use '#'
to terminate the number and immediately do the transfer instead of having to
dial the number and just wait for the feature digit timeout.
(issue #8366, xueliangliang)

Modified:
    branches/1.2/app.c

Modified: branches/1.2/app.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/app.c?view=diff&rev=59886&r1=59885&r2=59886
==============================================================================
--- branches/1.2/app.c (original)
+++ branches/1.2/app.c Tue Apr  3 12:58:19 2007
@@ -84,14 +84,11 @@
 			ast_playtones_stop(chan);
 		if (res < 1)
 			break;
+		if (res == '#')
+			break;
 		collect[x++] = res;
-		if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num)) {
-			if (collect[x-1] == '#') {
-				/* Not a valid extension, ending in #, assume the # was to finish dialing */
-				collect[x-1] = '\0';
-			}
-			break;
-		}
+		if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num))
+			break;
 	}
 	if (res >= 0) {
 		if (ast_exists_extension(chan, context, collect, 1, chan->cid.cid_num))