From f912c6ba71c01d106d81765f99abbcc2b458b938 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 5 Jul 2007 13:27:40 +0000 Subject: [PATCH] Merged revisions 73318 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r73318 | file | 2007-07-05 10:26:02 -0300 (Thu, 05 Jul 2007) | 2 lines Actually check to make sure a PBX was started on one of the Local channels instead of blindly assuming it was. (issue #10112 reported by makoto) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@73319 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_local.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/chan_local.c b/channels/chan_local.c index ff462ad4be..6b9ca55b66 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -464,10 +464,10 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout) } } - ast_set_flag(p, LOCAL_LAUNCHED_PBX); - /* Start switch on sub channel */ - res = ast_pbx_start(p->chan); + if (!(res = ast_pbx_start(p->chan))) + ast_set_flag(p, LOCAL_LAUNCHED_PBX); + ast_mutex_unlock(&p->lock); return res; }