diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-25 15:33:14 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-25 15:33:14 +0000 |
| commit | b24ad3acaba42d7f6e73bc70436ab22e462db1d3 (patch) | |
| tree | a328dc3e92d6452f8b05f93d335aed38cd4c9b59 /main/pbx.c | |
| parent | 1ee24f80f75a7a78ae599898340faf7ab133d143 (diff) | |
This patch reverts the changes made via 139347, and 139635, as users
are seeing adverse difference.
I will un-close 13251.
Back to the drawing board/ concept/ beginning/ whatever!
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@139764 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/main/pbx.c b/main/pbx.c index 88a6567ca..f4e5a150c 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -2539,10 +2539,7 @@ static int __ast_pbx_run(struct ast_channel *c) ast_log(LOG_WARNING, "Don't know what to do with '%s'\n", c->name); if (res != AST_PBX_KEEPALIVE) ast_softhangup(c, c->hangupcause ? c->hangupcause : AST_CAUSE_NORMAL_CLEARING); -#ifdef HANGUP_EXTEN_EXECUTION_MOVED_TO_res_features if ((res != AST_PBX_KEEPALIVE) && ast_exists_extension(c, c->context, "h", 1, c->cid.cid_num)) { - /* end before h exten was here */ - set_ext_pri(c, "h", 1); while(ast_exists_extension(c, c->context, c->exten, c->priority, c->cid.cid_num)) { if ((res = ast_spawn_extension(c, c->context, c->exten, c->priority, c->cid.cid_num))) { @@ -2556,7 +2553,6 @@ static int __ast_pbx_run(struct ast_channel *c) c->priority++; } } -#endif ast_set2_flag(c, autoloopflag, AST_FLAG_IN_AUTOLOOP); pbx_destroy(c->pbx); |