[asterisk-commits] tilghman: trunk r194138 - in /trunk: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue May 12 19:52:49 2009
New Revision: 194138

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

........
  r194137 | tilghman | 2009-05-12 19:52:03 -0500 (Tue, 12 May 2009) | 7 lines
  
  Fix logic for how to proceed with a single digit extension.
  (closes issue #15091)
   Reported by: andrew
   Patches: 
         20090512__issue15091.diff.txt uploaded by tilghman (license 14)
   Tested by: andrew
........

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

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

Modified: trunk/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/pbx.c?view=diff&rev=194138&r1=194137&r2=194138
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Tue May 12 19:52:49 2009
@@ -9122,7 +9122,7 @@
 	 * gone immediately to the "i" extension, but will now need to wait for a
 	 * timeout.
 	 */
-	if ((exten[0] = res) && (ast_exists_extension(chan, args.context, exten, 1, chan->cid.cid_num) || !ast_matchmore_extension(chan, args.context, exten, 1, chan->cid.cid_num))) {
+	if ((exten[0] = res) && !ast_matchmore_extension(chan, args.context, exten, 1, chan->cid.cid_num)) {
 		snprintf(chan->exten, sizeof(chan->exten), "%c", res);
 		ast_copy_string(chan->context, args.context, sizeof(chan->context));
 		chan->priority = 0;