Merged revisions 194138 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r194138 | tilghman | 2009-05-12 19:52:49 -0500 (Tue, 12 May 2009) | 14 lines

  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/branches/1.6.1@194140 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/pbx.c b/main/pbx.c
index c08008a8861966fa2b44188f96907bed986f30f2..4c9ecb368e047d7f1c187f2023c4d30ee0d2eb87 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -8238,7 +8238,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;