From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 15 Dec 2004 03:56:10 +0000 (+0000)
Subject: Make macro processing consistent with regular exten processing (bug #3044)
X-Git-Tag: 1.0.11.1~342
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a4530ceada9ce38c3d8561b96731817f2290821;p=thirdparty%2Fasterisk.git

Make macro processing consistent with regular exten processing (bug #3044)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4449 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_macro.c b/apps/app_macro.c
index ea6775c90d..03da13ed43 100755
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -140,7 +140,8 @@ static int macro_exec(struct ast_channel *chan, void *data)
   while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->callerid)) {
 	if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->callerid))) {
 		/* Something bad happened, or a hangup has been requested. */
-		if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F'))) {
+		if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F')) ||
+		    (res == '*') || (res == '#')) {
 			/* Just return result as to the previous application as if it had been dialed */
 			ast_log(LOG_DEBUG, "Oooh, got something to jump out with ('%c')!\n", res);
 			break;