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 1358a697815da9774e266e67cce97a22e88c8c2f..b403cae4a1736950c7ad761f68bb1d6650ef5bec 100644 (file)
--- 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;