diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-19 00:44:52 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-06-19 00:44:52 +0000 |
| commit | 5a0af27d759748ff23f935078bf5e0e6f1370e10 (patch) | |
| tree | 79e52309bf3ac9206b704f18f3c4d790c26bb1ba /main/features.c | |
| parent | 1b8e32afddaa378879858df1c5a6bbf01dd73671 (diff) | |
Merged revisions 201829 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r201829 | tilghman | 2009-06-18 19:43:41 -0500 (Thu, 18 Jun 2009) | 13 lines
Merged revisions 201828 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r201828 | tilghman | 2009-06-18 19:40:41 -0500 (Thu, 18 Jun 2009) | 6 lines
If the "h" extension fails, give it another chance in main/pbx.c.
If the "h" extension fails, give it another chance in main/pbx.c, when it
returns from the bridge code. Fixes an issue where the "h" extension may
occasionally not fire, when a Dial is executed from a Macro.
Debugged in #asterisk with user tompaw.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@201831 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index a01f33afe..084d10129 100644 --- a/main/features.c +++ b/main/features.c @@ -2795,7 +2795,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast bridge_cdr = NULL; } } - ast_set_flag(chan, AST_FLAG_BRIDGE_HANGUP_RUN); + if (chan->priority != 1 || !spawn_error) { + ast_set_flag(chan, AST_FLAG_BRIDGE_HANGUP_RUN); + } ast_channel_unlock(chan); /* protect the lastapp/lastdata against the effects of the hangup/dialplan code */ if (bridge_cdr) { |