From: Automerge script <automerge@asterisk.org>
Date: Tue, 30 Oct 2012 15:22:12 +0000 (+0000)
Subject: Merged revisions 375470 via svnmerge from
X-Git-Tag: 10.11.0-digiumphones-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8919c7068e8c1efbba126f1212474348da22e2fc;p=thirdparty%2Fasterisk.git

Merged revisions 375470 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

........
  r375470 | jrose | 2012-10-30 09:42:29 -0500 (Tue, 30 Oct 2012) | 7 lines

  confbridge: Fix a bug which made conferences not record with AMI/CLI commands

  (closes issue ASTERISK-20601)
  Reported by: Vilius
  Patches:
      confbridge_mixmonitor.diff uploaded by Jonathan Rose (license 6182)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@375481 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index 98a428ace3..22e1cd0e22 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -2157,7 +2157,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);
@@ -2495,7 +2495,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);