diff options
author | Mark Spencer <markster@digium.com> | 2005-10-04 17:41:30 +0000 |
---|---|---|
committer | Mark Spencer <markster@digium.com> | 2005-10-04 17:41:30 +0000 |
commit | 3f285f03e1364381745265b2a362aa4a3414ce2b (patch) | |
tree | 2f9cefe8cb966c5ceff2edce99688965ec1134f2 /pbx.c | |
parent | 1406f660b60157a754d0fc89520fefee814ea825 (diff) |
If you're hanging up channels, be sure we clean it up...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6712 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'pbx.c')
-rwxr-xr-x | pbx.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -4999,12 +4999,16 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout ast_mutex_unlock(&chan->lock); if (ast_pbx_run(chan)) { ast_log(LOG_ERROR, "Unable to run PBX on %s\n", chan->name); + if (channel) + *channel = NULL; ast_hangup(chan); res = -1; } } else { if (ast_pbx_start(chan)) { ast_log(LOG_ERROR, "Unable to start PBX on %s\n", chan->name); + if (channel) + *channel = NULL; ast_hangup(chan); res = -1; } @@ -5020,6 +5024,8 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout ast_cdr_failed(chan->cdr); } + if (channel) + *channel = NULL; ast_hangup(chan); } } @@ -5079,6 +5085,8 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout if (ast_pthread_create(&as->p, &attr, async_wait, as)) { ast_log(LOG_WARNING, "Failed to start async wait\n"); free(as); + if (channel) + *channel = NULL; ast_hangup(chan); res = -1; goto outgoing_exten_cleanup; |