aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-05 13:26:02 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-05 13:26:02 +0000
commita511f85bc113c49910db9e929c782dc03b339993 (patch)
tree52c112c7365e756fea29f01e19ba58d601d311f7
parent8f45eb5228d976af7fc99248b88aa619c71c1178 (diff)
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/branches/1.2@73318 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_local.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 9dceded67..9a0f8d61b 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -391,10 +391,10 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout)
}
}
- p->launchedpbx = 1;
-
/* Start switch on sub channel */
- res = ast_pbx_start(p->chan);
+ if (!(res = ast_pbx_start(p->chan)))
+ p->launchedpbx = 1;
+
ast_mutex_unlock(&p->lock);
return res;
}