From 087a26f492cf1afd8e3763ed43f5162b701b3a67 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Fri, 30 May 2008 16:40:51 +0000 Subject: [PATCH] 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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@119300 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_stack.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/app_stack.c b/apps/app_stack.c index 20eff2c753..5a8334771c 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -448,9 +448,16 @@ static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, char **arg 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); }