[Asterisk-cvs] asterisk/apps app_macro.c,1.11,1.11.2.1

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv32038/apps

Modified Files:
      Tag: v1-0_stable
	app_macro.c 
Log Message:
Restore extension unless ASYNC_GOTO (bug #1141)


Index: app_macro.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_macro.c,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- app_macro.c	21 Aug 2003 23:26:13 -0000	1.11
+++ app_macro.c	4 Mar 2004 05:58:13 -0000	1.11.2.1
@@ -202,7 +202,7 @@
   	/* If we're leaving the macro normally, restore original information */
 	chan->priority = oldpriority;
 	strncpy(chan->context, oldcontext, sizeof(chan->context) - 1);
-	if (!chan->_softhangup) {
+	if (!(chan->_softhangup & AST_SOFTHANGUP_ASYNCGOTO)) {
 		/* 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"))) {