Wed Mar 12 07:00:01 CET 2003

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@641 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 11 insertions, 8 deletions

diff --git a/apps/app_macro.c b/apps/app_macro.c
index c06fa117f..0b4a11fc4 100755
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -184,17 +184,20 @@ out:
   pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", save_macro_priority);
   if (save_macro_priority) free(save_macro_priority);
 
-  if (!strcasecmp(chan->context, fullmacro) && !chan->_softhangup) {
+  if (!strcasecmp(chan->context, fullmacro)) {
   	/* If we're leaving the macro normally, restore original information */
 	chan->priority = oldpriority;
-	strncpy(chan->exten, oldexten, sizeof(chan->exten) - 1);
 	strncpy(chan->context, oldcontext, sizeof(chan->context) - 1);
-	if ((offsets = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET"))) {
-		/* Handle macro offset if it's set by checking the availability of step n + offset + 1, otherwise continue
-		   normally if there is any problem */
-		if (sscanf(offsets, "%d", &offset) == 1) {
-			if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + offset + 1, chan->callerid)) {
-				chan->priority += offset;
+	if (!chan->_softhangup) {
+		/* Copy the extension, so long as we're not in softhangup, where we could be given an asyncgoto */
+		strncpy(chan->exten, oldexten, sizeof(chan->exten) - 1);
+		if ((offsets = pbx_builtin_getvar_helper(chan, "MACRO_OFFSET"))) {
+			/* Handle macro offset if it's set by checking the availability of step n + offset + 1, otherwise continue
+			   normally if there is any problem */
+			if (sscanf(offsets, "%d", &offset) == 1) {
+				if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + offset + 1, chan->callerid)) {
+					chan->priority += offset;
+				}
 			}
 		}
 	}