diff --git a/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx b/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx index dd1ed47b9e71892799c11517663c3822b9a3f6d9..fa3c77ed970a8e681c85a5a1d9faf224e064d227 100755 --- a/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx @@ -98,8 +98,8 @@ class BreakoutJoinConfirmation extends Component { const urlFromSelectedRoom = getURL(selectValue); const url = isFreeJoin ? urlFromSelectedRoom : breakoutURL; + // leave main room's audio, and stops video and screenshare when joining a breakout room if (voiceUserJoined) { - // leave main room's audio when joining a breakout room AudioService.exitAudio(); logger.info({ logCode: 'breakoutjoinconfirmation_ended_audio', @@ -108,6 +108,7 @@ class BreakoutJoinConfirmation extends Component { } VideoService.exitVideo(); + window.kurentoExitScreenShare(); if (url === '') { logger.error({ logCode: 'breakoutjoinconfirmation_redirecting_to_url', diff --git a/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx index fc01dcce24bc143e935c2432379e7735864c3e7a..0ba5df04cc78ae5f2d485d38237021190172706f 100644 --- a/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx @@ -204,12 +204,14 @@ class BreakoutRoom extends PureComponent { aria-label={`${intl.formatMessage(intlMessages.breakoutJoin)} ${number}`} onClick={() => { this.getBreakoutURL(breakoutId); + // leave main room's audio, and stops video and screenshare when joining a breakout room exitAudio(); logger.debug({ logCode: 'breakoutroom_join', extraInfo: { logType: 'user_action' }, }, 'joining breakout room closed audio in the main room'); VideoService.exitVideo(); + window.kurentoExitScreenShare(); } } disabled={disable}