diff options
author | Sean Bright <sean.bright@gmail.com> | 2017-08-29 10:26:17 -0400 |
---|---|---|
committer | Sean Bright <sean.bright@gmail.com> | 2017-08-29 09:28:06 -0500 |
commit | 9af11c6acd7df573f1ac9c6093385ee104e4c943 (patch) | |
tree | d48932d54775c0a71e375cd4723ea9ecdaaa9b9c /apps | |
parent | d05ab9e91a05725fb7cde40d217497b224a106d0 (diff) |
confbridge: Handle user hangup during name recording
This prevents orphaned CBAnn channels from getting stuck in the bridge.
ASTERISK-26994 #close
Reported by: James Terhune
Change-Id: I5e43e832a9507ec3f2c59752cd900b41dab80457
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_confbridge.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index b2d612df3..d218d0f2e 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -2326,7 +2326,11 @@ static int confbridge_exec(struct ast_channel *chan, const char *data) if (!quiet && (ast_test_flag(&user.u_profile, USER_OPT_ANNOUNCE_JOIN_LEAVE) || (ast_test_flag(&user.u_profile, USER_OPT_ANNOUNCE_JOIN_LEAVE_REVIEW)))) { - conf_rec_name(&user, args.conf_name); + if (conf_rec_name(&user, args.conf_name)) { + pbx_builtin_setvar_helper(chan, "CONFBRIDGE_RESULT", "FAILED"); + res = -1; /* Hangup during name recording */ + goto confbridge_cleanup; + } } /* menu name */ |