diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-05 13:28:41 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-05 13:28:41 +0000 |
| commit | aec54ca7a6965f2744de37af2edec2a35f09ab1d (patch) | |
| tree | b32752baf51e57aa45d535e1cb150c6a218eb653 /channels/chan_local.c | |
| parent | 601ea83b5cf28986639814da550469ef5b7b2b26 (diff) | |
Merged revisions 73319 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r73319 | file | 2007-07-05 10:27:40 -0300 (Thu, 05 Jul 2007) | 10 lines
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: http://svn.digium.com/svn/asterisk/trunk@73320 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
| -rw-r--r-- | channels/chan_local.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 47b862b37..beac4064e 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -474,10 +474,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; } |