[asterisk-commits] jrose: trunk r375472 - in /trunk: ./ apps/app_confbridge.c

[SVN commits to the Asterisk project]

Author: jrose
Date: Tue Oct 30 10:10:38 2012
New Revision: 375472

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=375472
Log:
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)
........

Merged revisions 375470 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 375471 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/apps/app_confbridge.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_confbridge.c?view=diff&rev=375472&r1=375471&r2=375472
==============================================================================
--- trunk/apps/app_confbridge.c (original)
+++ trunk/apps/app_confbridge.c Tue Oct 30 10:10:38 2012
@@ -2273,7 +2273,7 @@
 		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);
@@ -2611,7 +2611,7 @@
 		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);