summaryrefslogtreecommitdiff
path: root/bridges
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2016-11-08 13:28:02 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-11-08 13:28:02 -0600
commit0d85f1868d3b35f8c7582d519f3640a7cd2d4ce6 (patch)
tree250890f8d7a898f5be2a60451802b3b667ea3bc6 /bridges
parent392202304d248147378f1e16f1f012285dc1221f (diff)
parentfbbbd0add9c180b000309da5c00d582a51d73734 (diff)
Merge "automon: restore mixing of the both channels after recording stops"
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 3821feef9..332857347 100644
--- a/bridges/bridge_builtin_features.c
+++ b/bridges/bridge_builtin_features.c
@@ -200,6 +200,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);