FS-9076 #resolve

diff --git a/src/mod/applications/mod_conference/conference_api.c b/src/mod/applications/mod_conference/conference_api.c
index cc7c28b2e9fd60ad51795e021ceff8c569dbb12e..e6f097f2008edd0596ac97f14ae0f439d578980c 100644 (file)
--- 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 2ff3ae4dbd0a62412239d5a7eb30272d162d7df3..843f04fa189992bea679026a556bbc9952ae5271 100644 (file)
--- 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;