From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 13 May 2009 00:52:49 +0000 (+0000)
Subject: Merged revisions 194137 via svnmerge from
X-Git-Tag: 11.0.0-beta1~4896
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b399b5389d4cc134da1c3ed7a8b739c6895ca924;p=thirdparty%2Fasterisk.git

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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@194138 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index dbde400b9a..a0083a0af1 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -9122,7 +9122,7 @@ static int pbx_builtin_background(struct ast_channel *chan, void *data)
 	 * 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;