diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_chanspy.c | 2 | ||||
| -rw-r--r-- | apps/app_mixmonitor.c | 2 | ||||
| -rw-r--r-- | apps/app_stack.c | 9 |
3 files changed, 4 insertions, 9 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 5806b997d..9f530c50d 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -508,7 +508,7 @@ static int start_spying(struct ast_autochan *autochan, const char *spychan_name, if (!res) { ast_channel_lock(autochan->chan); if (ast_channel_is_bridged(autochan->chan)) { - ast_softhangup_nolock(autochan->chan, AST_SOFTHANGUP_UNBRIDGE); + ast_channel_set_unbridged_nolock(autochan->chan, 1); } ast_channel_unlock(autochan->chan); } diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c index 52128942a..cf7b93518 100644 --- a/apps/app_mixmonitor.c +++ b/apps/app_mixmonitor.c @@ -461,7 +461,7 @@ static int startmon(struct ast_channel *chan, struct ast_audiohook *audiohook) if (!res) { ast_channel_lock(chan); if (ast_channel_is_bridged(chan)) { - ast_softhangup_nolock(chan, AST_SOFTHANGUP_UNBRIDGE); + ast_channel_set_unbridged_nolock(chan, 1); } ast_channel_unlock(chan); } diff --git a/apps/app_stack.c b/apps/app_stack.c index b05afb0e5..c9d37cd34 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -976,10 +976,9 @@ static int gosub_run(struct ast_channel *chan, const char *sub_args, int ignore_ /* Save non-hangup softhangup flags. */ saved_hangup_flags = ast_channel_softhangup_internal_flag(chan) - & (AST_SOFTHANGUP_ASYNCGOTO | AST_SOFTHANGUP_UNBRIDGE); + & AST_SOFTHANGUP_ASYNCGOTO; if (saved_hangup_flags) { - ast_channel_clear_softhangup(chan, - AST_SOFTHANGUP_ASYNCGOTO | AST_SOFTHANGUP_UNBRIDGE); + ast_channel_clear_softhangup(chan, AST_SOFTHANGUP_ASYNCGOTO); } /* Save autoloop flag */ @@ -1028,10 +1027,6 @@ static int gosub_run(struct ast_channel *chan, const char *sub_args, int ignore_ */ do { /* Check for hangup. */ - if (ast_channel_softhangup_internal_flag(chan) & AST_SOFTHANGUP_UNBRIDGE) { - saved_hangup_flags |= AST_SOFTHANGUP_UNBRIDGE; - ast_channel_clear_softhangup(chan, AST_SOFTHANGUP_UNBRIDGE); - } if (ast_check_hangup(chan)) { if (ast_channel_softhangup_internal_flag(chan) & AST_SOFTHANGUP_ASYNCGOTO) { ast_log(LOG_ERROR, "%s An async goto just messed up our execution location.\n", |