diff options
| -rw-r--r-- | main/pbx.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/main/pbx.c b/main/pbx.c index f4dfd0d52..9aa96118c 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -4609,17 +4609,23 @@ int ast_async_goto(struct ast_channel *chan, const char *context, const char *ex S_OR(context, chan->context), S_OR(exten, chan->exten), priority); /* Masquerade into temp channel */ - ast_channel_masquerade(tmpchan, chan); - - /* Grab the locks and get going */ - ast_channel_lock(tmpchan); - ast_do_masquerade(tmpchan); - ast_channel_unlock(tmpchan); - /* Start the PBX going on our stolen channel */ - if (ast_pbx_start(tmpchan)) { - ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmpchan->name); + if (ast_channel_masquerade(tmpchan, chan)) { + /* Failed to set up the masquerade. It's probably chan_local + * in the middle of optimizing itself out. Sad. :( */ ast_hangup(tmpchan); + tmpchan = NULL; res = -1; + } else { + /* Grab the locks and get going */ + ast_channel_lock(tmpchan); + ast_do_masquerade(tmpchan); + ast_channel_unlock(tmpchan); + /* Start the PBX going on our stolen channel */ + if (ast_pbx_start(tmpchan)) { + ast_log(LOG_WARNING, "Unable to start PBX on %s\n", tmpchan->name); + ast_hangup(tmpchan); + res = -1; + } } } } |