From e1da5dbd571f686064a49b3152ff8f2319af09e0 Mon Sep 17 00:00:00 2001 From: Jonathan Rose Date: Tue, 30 Oct 2012 14:58:19 +0000 Subject: [PATCH] confbridge: Fix a bug which made conferences not record with AMI/CLI commands When confbridge was changed to handle conference status with a state machine in r374658. The function responsible for starting recording for a conference was refactored with the function actually responsible for launching the recording thread being split into a function with another name. The old function name was still used for manually started recordings through AMI or CLI. This patch fixes that by switching which function is used to start recording the conference. (closes issue ASTERISK-20601) Reported by: Vilius Patches: confbridge_mixmonitor.diff uploaded by Jonathan Rose (license 6182) ........ Merged revisions 375470 from http://svn.asterisk.org/svn/asterisk/branches/10 git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@375471 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_confbridge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index d52b1e52e6..3295d2746c 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -2264,7 +2264,7 @@ static char *handle_cli_confbridge_start_record(struct ast_cli_entry *e, int cmd ast_copy_string(bridge->b_profile.rec_file, rec_file, sizeof(bridge->b_profile.rec_file)); } - if (conf_start_record(bridge)) { + if (start_conf_record_thread(bridge)) { ast_cli(a->fd, "Could not start recording due to internal error.\n"); ao2_unlock(bridge); ao2_ref(bridge, -1); @@ -2602,7 +2602,7 @@ static int action_confbridgestartrecord(struct mansession *s, const struct messa ast_copy_string(bridge->b_profile.rec_file, recordfile, sizeof(bridge->b_profile.rec_file)); } - if (conf_start_record(bridge)) { + if (start_conf_record_thread(bridge)) { astman_send_error(s, m, "Internal error starting conference recording."); ao2_unlock(bridge); ao2_ref(bridge, -1);