Merge "automon: restore mixing of the both channels after recording stops"

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);