diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-13 00:54:14 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-13 00:54:14 +0000 |
commit | 64649e0f09666a691af6b9f3a304689de0bb17f8 (patch) | |
tree | 55a90b69781eefde591b0266447fc130bb874c84 | |
parent | 28343c3798d9d3da6ea9d7ee02245fef741ee4c5 (diff) |
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@194140 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index c08008a88..4c9ecb368 100644 --- 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; |