[asterisk-commits] tilghman: trunk r43075 - in /trunk: ./ apps/app_directory.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Sun Sep 17 09:00:39 2006
New Revision: 43075

URL: http://svn.digium.com/view/asterisk?rev=43075&view=rev
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_directory.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_directory.c?rev=43075&r1=43074&r2=43075&view=diff
==============================================================================
--- trunk/apps/app_directory.c (original)
+++ trunk/apps/app_directory.c Sun Sep 17 09:00:39 2006
@@ -411,7 +411,7 @@
 		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 @@
 		}
 	}	
 	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;