[svn-commits] tilghman: branch 1.6.0 r119300 - in /branches/1.6.0: ./ apps/app_stack.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri May 30 11:40:51 2008
New Revision: 119300

URL: http://svn.digium.com/view/asterisk?view=rev&rev=119300
Log:
Merged revisions 119299 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r119299 | tilghman | 2008-05-30 11:40:13 -0500 (Fri, 30 May 2008) | 2 lines

Suppress warning about pbx structure already existing

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_stack.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_stack.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_stack.c?view=diff&rev=119300&r1=119299&r2=119300
==============================================================================
--- branches/1.6.0/apps/app_stack.c (original)
+++ branches/1.6.0/apps/app_stack.c Fri May 30 11:40:51 2008
@@ -448,9 +448,16 @@
 		chan->priority = 0;
 
 		if ((res = pbx_exec(chan, theapp, gosub_args)) == 0) {
+			struct ast_pbx *pbx = chan->pbx;
+			/* Suppress warning about PBX already existing */
+			chan->pbx = NULL;
 			ast_agi_fdprintf(chan, agi->fd, "100 result=0 Trying...\n");
 			ast_pbx_run(chan);
 			ast_agi_fdprintf(chan, agi->fd, "200 result=0 Gosub complete\n");
+			if (chan->pbx) {
+				ast_free(chan->pbx);
+			}
+			chan->pbx = pbx;
 		} else {
 			ast_agi_fdprintf(chan, agi->fd, "200 result=%d Gosub failed\n", res);
 		}