Merged revisions 43072 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@43075 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
5c0e56df21
commit
d9a203dd9d
|
@ -411,7 +411,7 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, struct
|
|||
return -1;
|
||||
}
|
||||
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_goto_if_exists(chan, chan->macrocontext, "o", 1))) {
|
||||
return 0;
|
||||
|
@ -422,7 +422,7 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, struct
|
|||
}
|
||||
}
|
||||
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_goto_if_exists(chan, chan->macrocontext, "a", 1))) {
|
||||
return 0;
|
||||
|
|
Reference in New Issue