diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-08-30 13:54:05 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-08-30 13:54:05 -0500 |
| commit | ff23bf1e75a3630ccd9c0d7262de64edb2823a88 (patch) | |
| tree | 07e169f104010ff63c104c34b21900ccfb4376b2 | |
| parent | b96306e3a680f04b3bdce69892f82b61891aed27 (diff) | |
| parent | f5820f40bb93e51bf19d3355e61ce74482e9e7d0 (diff) | |
Merge "confbridge: Handle user hangup during name recording" into 14
| -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 a33622f11..f5f0742f5 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -2320,7 +2320,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 */ |