diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-11 21:35:16 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-11 21:35:16 +0000 |
| commit | 0b627b96e19c7b4865d2de8679f8c66f3c56b226 (patch) | |
| tree | cc05ccf81fe461c43bc87779ed4d42457fa16c27 /main | |
| parent | c7eae520d5cecef12f296cb06618b2d82924f98f (diff) | |
It's possible that a channel can have an async goto on the successful execution of an application as well.
Closes issue #12172.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@114072 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/pbx.c b/main/pbx.c index 41027c35a..685610583 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -2439,7 +2439,7 @@ static int __ast_pbx_run(struct ast_channel *c) if (option_verbose > 1) ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name); if (c->_softhangup == AST_SOFTHANGUP_ASYNCGOTO) { - c->_softhangup =0; + c->_softhangup = 0; } else if (c->_softhangup == AST_SOFTHANGUP_TIMEOUT) { /* atimeout, nothing bad */ } else { @@ -2449,7 +2449,9 @@ static int __ast_pbx_run(struct ast_channel *c) break; } } - if (c->_softhangup == AST_SOFTHANGUP_TIMEOUT && ast_exists_extension(c,c->context,"T",1,c->cid.cid_num)) { + if (c->_softhangup == AST_SOFTHANGUP_ASYNCGOTO) { + c->_softhangup = 0; + } else if (c->_softhangup == AST_SOFTHANGUP_TIMEOUT && ast_exists_extension(c,c->context,"T",1,c->cid.cid_num)) { set_ext_pri(c, "T", 0); /* 0 will become 1 with the c->priority++; at the end */ /* If the AbsoluteTimeout is not reset to 0, we'll get an infinite loop */ c->whentohangup = 0; |