summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-11-08 07:58:28 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-11-08 07:58:28 -0600
commit3870e8d76d62694debb5bb6cfddc7f49194cf5ea (patch)
tree3387769353a178428f01ae7d69719cdd85aae121 /bridges
parent7477c95749985a2c1320bde333b7a20b9b4815ed (diff)
parent59c23e1768a48825cd628b8c4b59f7eb46b8d364 (diff)
Merge "automon: restore mixing of the both channels after recording stops" into 13
Diffstat (limited to 'bridges')
-rw-r--r--bridges/bridge_builtin_features.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/bridges/bridge_builtin_features.c b/bridges/bridge_builtin_features.c
index d09a7a2ec..43cf2c971 100644
--- a/bridges/bridge_builtin_features.c
+++ b/bridges/bridge_builtin_features.c
@@ -202,6 +202,8 @@ static void start_automonitor(struct ast_bridge_channel *bridge_channel, struct
return;
}
+ ast_monitor_setjoinfiles(peer_chan, 1);
+
if (features_cfg && !ast_strlen_zero(features_cfg->courtesytone)) {
ast_bridge_channel_queue_playfile(bridge_channel, NULL, features_cfg->courtesytone, NULL);
ast_bridge_channel_write_playfile(bridge_channel, NULL, features_cfg->courtesytone, NULL);