[svn-commits] russell: trunk r59888 - in /trunk: ./ main/app.c

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Apr  3 13:02:47 2007
New Revision: 59888

URL: http://svn.digium.com/view/asterisk?view=rev&rev=59888
Log:
Merged revisions 59887 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r59887 | russell | 2007-04-03 13:01:49 -0500 (Tue, 03 Apr 2007) | 13 lines

Merged revisions 59886 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r59886 | russell | 2007-04-03 12:58:19 -0500 (Tue, 03 Apr 2007) | 5 lines

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:
    trunk/   (props changed)
    trunk/main/app.c

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

Modified: trunk/main/app.c
URL: http://svn.digium.com/view/asterisk/trunk/main/app.c?view=diff&rev=59888&r1=59887&r2=59888
==============================================================================
--- trunk/main/app.c (original)
+++ trunk/main/app.c Tue Apr  3 13:02:47 2007
@@ -85,14 +85,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';
-			}
+		if (!ast_matchmore_extension(chan, context, collect, 1, chan->cid.cid_num))
 			break;
-		}
 	}
 	if (res >= 0)
 		res = ast_exists_extension(chan, context, collect, 1, chan->cid.cid_num) ? 1 : 0;