From: Automerge script Date: Sun, 17 Sep 2006 14:02:31 +0000 (+0000) Subject: automerge commit X-Git-Tag: 1.2.13-netsec~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e4fd6f9b5c6378f18447e578cfe5ba0b22d560c;p=thirdparty%2Fasterisk.git automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43087 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_directory.c b/apps/app_directory.c index 1358a69781..b403cae4a1 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -426,7 +426,7 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, char * 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; @@ -437,7 +437,7 @@ static int do_directory(struct ast_channel *chan, struct ast_config *cfg, char * } } 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;