From be8440b0b0dcead84bc5815579bba659ae265e7d Mon Sep 17 00:00:00 2001 From: Brian West Date: Tue, 26 Apr 2016 09:51:39 -0500 Subject: [PATCH] FS-9076 #resolve --- src/mod/applications/mod_conference/conference_api.c | 5 +++++ src/mod/applications/mod_conference/conference_record.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/mod/applications/mod_conference/conference_api.c b/src/mod/applications/mod_conference/conference_api.c index cc7c28b2e9..e6f097f200 100644 --- a/src/mod/applications/mod_conference/conference_api.c +++ b/src/mod/applications/mod_conference/conference_api.c @@ -2510,6 +2510,11 @@ switch_status_t conference_api_sub_record(conference_obj_t *conference, switch_s return SWITCH_STATUS_GENERR; } + if (conference->conference_video_mode == CONF_VIDEO_MODE_PASSTHROUGH) { + stream->write_function(stream, "-ERR Video Passthru enabled, recording not permitted.\n"); + return SWITCH_STATUS_SUCCESS; + } + if (conference_utils_test_flag(conference, CFLAG_PERSONAL_CANVAS)) { stream->write_function(stream, "-ERR Personal Canvas enabled, recording not permitted.\n"); return SWITCH_STATUS_SUCCESS; diff --git a/src/mod/applications/mod_conference/conference_record.c b/src/mod/applications/mod_conference/conference_record.c index 2ff3ae4dbd..843f04fa18 100644 --- a/src/mod/applications/mod_conference/conference_record.c +++ b/src/mod/applications/mod_conference/conference_record.c @@ -60,6 +60,11 @@ void conference_record_launch_thread(conference_obj_t *conference, char *path, i return; } + if (conference->conference_video_mode == CONF_VIDEO_MODE_PASSTHROUGH) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Video Passthru enabled, recording not permitted.\n"); + return; + } + if (conference_utils_test_flag(conference, CFLAG_PERSONAL_CANVAS)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Personal Canvas enabled, recording not permitted.\n"); return;