From: root <root@mxserver2.(none)>
Date: Fri, 13 Nov 2015 03:00:18 +0000 (+0800)
Subject: FS-8527 [mod_conference] Do not send the video of last_video_floor_holder to video_fl... 
X-Git-Tag: v1.6.5~5^2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=acecda7596beb5dc3a4f98cb126351d9c25454fb;p=thirdparty%2Ffreeswitch.git

FS-8527 [mod_conference] Do not send the video of last_video_floor_holder to video_floor_holder if already related one video to it.
---

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 1dabed8888..41070a60e6 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -3468,7 +3468,8 @@ switch_status_t conference_video_thread_callback(switch_core_session_t *session,
 			conference_member_t *fmember;
 
 			if ((fmember = conference_member_get(member->conference, member->conference->video_floor_holder))) {
-				switch_core_session_write_video_frame(fmember->session, frame, SWITCH_IO_FLAG_NONE, 0);
+				if (!conference_utils_member_test_flag(fmember, MFLAG_RECEIVING_VIDEO))
+					switch_core_session_write_video_frame(fmember->session, frame, SWITCH_IO_FLAG_NONE, 0);
 				switch_thread_rwlock_unlock(fmember->rwlock);
 			}
 		}