From 5f72cecf4f55116f304b57ac0fa6008eaee91063 Mon Sep 17 00:00:00 2001 From: prlanzarin Date: Thu, 20 Aug 2020 01:12:27 +0000 Subject: [PATCH] video-provider: fix mirrorOwnWebcam behaviour (regression from #10208) --- .../imports/ui/components/video-provider/service.js | 4 ++-- .../video-provider/video-list/video-list-item/component.jsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/service.js b/bigbluebutton-html5/imports/ui/components/video-provider/service.js index a52ec57733..37551e42c0 100755 --- a/bigbluebutton-html5/imports/ui/components/video-provider/service.js +++ b/bigbluebutton-html5/imports/ui/components/video-provider/service.js @@ -277,9 +277,9 @@ class VideoService { }; } - mirrorOwnWebcam(user) { + mirrorOwnWebcam(userId = null) { // only true if setting defined and video ids match - const isOwnWebcam = user ? this.userId() === user.userId : true; + const isOwnWebcam = userId ? Auth.userID === userId : true; const isEnabledMirroring = getFromUserSettings('bbb_mirror_own_webcam', MIRROR_WEBCAM); return isOwnWebcam && isEnabledMirroring; } diff --git a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx index a962bb505d..debf4cfa0e 100755 --- a/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/video-provider/video-list/video-list-item/component.jsx @@ -31,7 +31,7 @@ class VideoListItem extends Component { isFullscreen: false, }; - this.mirrorOwnWebcam = VideoService.mirrorOwnWebcam(props.user); + this.mirrorOwnWebcam = VideoService.mirrorOwnWebcam(props.userId); this.setVideoIsReady = this.setVideoIsReady.bind(this); this.onFullscreenChange = this.onFullscreenChange.bind(this);