diff --git a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx index 04161e8635cfaaa187dee9d1e6651fd7f21c69c1..c59170c9ce6f0289bafe6057bd13a695c46eced6 100755 --- a/bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/audio/audio-controls/container.jsx @@ -54,16 +54,23 @@ const { joinListenOnly, } = Service; -export default lockContextContainer(withModalMounter(withTracker(({ mountModal, userLocks }) => ({ - processToggleMuteFromOutside: arg => processToggleMuteFromOutside(arg), - showMute: isConnected() && !isListenOnly() && !isEchoTest() && !userLocks.userMic, - muted: isConnected() && !isListenOnly() && isMuted(), - inAudio: isConnected() && !isEchoTest(), - listenOnly: isConnected() && isListenOnly(), - disable: isConnecting() || isHangingUp() || !Meteor.status().connected, - talking: isTalking() && !isMuted(), - isVoiceUser: isVoiceUser(), - handleToggleMuteMicrophone: () => toggleMuteMicrophone(), - handleJoinAudio: () => (isConnected() ? joinListenOnly() : mountModal(<AudioModalContainer />)), - handleLeaveAudio, -}))(AudioControlsContainer))); +export default lockContextContainer(withModalMounter(withTracker(({ mountModal, userLocks }) => { + if (Service.isReturningFromBreakoutAudioTransfer()) { + Service.setReturningFromBreakoutAudioTransfer(false); + Service.recoverMicState(); + } + + return ({ + processToggleMuteFromOutside: arg => processToggleMuteFromOutside(arg), + showMute: isConnected() && !isListenOnly() && !isEchoTest() && !userLocks.userMic, + muted: isConnected() && !isListenOnly() && isMuted(), + inAudio: isConnected() && !isEchoTest(), + listenOnly: isConnected() && isListenOnly(), + disable: isConnecting() || isHangingUp() || !Meteor.status().connected, + talking: isTalking() && !isMuted(), + isVoiceUser: isVoiceUser(), + handleToggleMuteMicrophone: () => toggleMuteMicrophone(), + handleJoinAudio: () => (isConnected() ? joinListenOnly() : mountModal(<AudioModalContainer />)), + handleLeaveAudio, + }) +})(AudioControlsContainer))); diff --git a/bigbluebutton-html5/imports/ui/components/audio/service.js b/bigbluebutton-html5/imports/ui/components/audio/service.js index 2848ec87c0d848205b2a10648131b073ae3c1a78..eab4d128bd5b6739fc0ac31f4df9a67154919238 100755 --- a/bigbluebutton-html5/imports/ui/components/audio/service.js +++ b/bigbluebutton-html5/imports/ui/components/audio/service.js @@ -124,4 +124,10 @@ export default { playAlertSound: url => AudioManager.playAlertSound(url), updateAudioConstraints: constraints => AudioManager.updateAudioConstraints(constraints), + recoverMicState, + setReturningFromBreakoutAudioTransfer: (value) => { + AudioManager.returningFromBreakoutAudioTransfer = value; + }, + isReturningFromBreakoutAudioTransfer: + () => AudioManager.returningFromBreakoutAudioTransfer, }; diff --git a/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx b/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx index 775da1527923e0ff83296718c0544269798906f2..c075d762d1470ec8cc03c460e8290d66684d3991 100644 --- a/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/breakout-room/component.jsx @@ -162,6 +162,7 @@ class BreakoutRoom extends PureComponent { intl, isUserInBreakoutRoom, exitAudio, + setReturningFromBreakoutAudioTransfer, } = this.props; const { @@ -175,6 +176,7 @@ class BreakoutRoom extends PureComponent { const disable = waiting && requestedBreakoutId !== breakoutId; const audioAction = joinedAudioOnly ? () => { + setReturningFromBreakoutAudioTransfer(true); this.returnBackToMeeeting(breakoutId); return logger.debug({ logCode: 'breakoutroom_return_main_audio', diff --git a/bigbluebutton-html5/imports/ui/components/breakout-room/container.jsx b/bigbluebutton-html5/imports/ui/components/breakout-room/container.jsx index 4cc8d0788472ae996f57e92de8a3cb10ca2b7cf4..a118057d345c73ce0e0ff61d3b9646d9d4a6ce2c 100644 --- a/bigbluebutton-html5/imports/ui/components/breakout-room/container.jsx +++ b/bigbluebutton-html5/imports/ui/components/breakout-room/container.jsx @@ -25,6 +25,7 @@ export default withTracker((props) => { const breakoutRooms = findBreakouts(); const isMicrophoneUser = AudioService.isConnected() && !AudioService.isListenOnly(); const isMeteorConnected = Meteor.status().connected; + const { setReturningFromBreakoutAudioTransfer } = AudioService; return { ...props, @@ -41,5 +42,6 @@ export default withTracker((props) => { isMeteorConnected, isUserInBreakoutRoom, exitAudio: () => AudioManager.exitAudio(), + setReturningFromBreakoutAudioTransfer, }; })(BreakoutContainer); diff --git a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js index 5027304d4a02794ba712de40b59fdb4aa0431c1c..5213040d9053df335111aae62171d799992a0d40 100755 --- a/bigbluebutton-html5/imports/ui/services/audio-manager/index.js +++ b/bigbluebutton-html5/imports/ui/services/audio-manager/index.js @@ -37,6 +37,8 @@ class AudioManager { tracker: new Tracker.Dependency(), }; + this._returningFromBreakoutAudioTransfer = false; + this.defineProperties({ isMuted: false, isConnected: false, @@ -523,6 +525,14 @@ class AudioManager { ? this.bridge.inputDeviceId : DEFAULT_INPUT_DEVICE_ID; } + get returningFromBreakoutAudioTransfer() { + return this._returningFromBreakoutAudioTransfer; + } + + set returningFromBreakoutAudioTransfer(value) { + this._returningFromBreakoutAudioTransfer = value; + } + set userData(value) { this._userData = value; }