kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 43072 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43072 | tilghman | 2006-09-17 08:54:34 -0500 (Sun, 17 Sep 2006) | 3 lines

Directory used the wrong context for delivery of 0- and *- keypresses
(according to Directory's own documentation) - Issue 7965

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43075 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2006-09-17 14:00:39 +00:00
parent c2c4f86c72
commit e39c9d7619
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_directory.c
View File

@@ -411,7 +411,7 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, struct
return -1; return -1;
} }
if (digit == '0') { if (digit == '0') {
if (!ast_goto_if_exists(chan, chan->context, "o", 1) || if (!ast_goto_if_exists(chan, dialcontext, "o", 1) ||
(!ast_strlen_zero(chan->macrocontext) && (!ast_strlen_zero(chan->macrocontext) &&
!ast_goto_if_exists(chan, chan->macrocontext, "o", 1))) { !ast_goto_if_exists(chan, chan->macrocontext, "o", 1))) {
return 0; return 0;
@@ -422,7 +422,7 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, struct
} }
} }
if (digit == '*') { if (digit == '*') {
if (!ast_goto_if_exists(chan, chan->context, "a", 1) || if (!ast_goto_if_exists(chan, dialcontext, "a", 1) ||
(!ast_strlen_zero(chan->macrocontext) && (!ast_strlen_zero(chan->macrocontext) &&
!ast_goto_if_exists(chan, chan->macrocontext, "a", 1))) { !ast_goto_if_exists(chan, chan->macrocontext, "a", 1))) {
return 0; return 0;