BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.3.5-into-develop

Browse Source
This commit is contained in:
Anton Georgiev 2021-07-06 19:37:30 +00:00
commit 1fd6246336
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bigbluebutton-config/bigbluebutton-release
View File

@ -1 +1,2 @@
BIGBLUEBUTTON_RELEASE=2.4-alpha-2

2
bigbluebutton-html5/imports/ui/components/audio/audio-controls/component.jsx
View File

@ -206,7 +206,7 @@ class AudioControls extends PureComponent {
return (
<span className={styles.container}>
{isVoiceUser && inputStream && muteAlertEnabled && !listenOnly && muted ? (
{isVoiceUser && inputStream && muteAlertEnabled && !listenOnly && muted && showMute ? (
<MutedAlert {...{
muted, inputStream, isViewer, isPresenter,
}}

2
bigbluebutton-html5/imports/utils/sdpUtils.js
View File

@ -66,7 +66,7 @@ const stripMDnsCandidates = (sdp) => {
};
const filterValidIceCandidates = (validIceCandidates, sdp) => {
if (!validIceCandidates.length) return sdp;
if (!validIceCandidates || !validIceCandidates.length) return sdp;
const matchCandidatesIp = (candidate, mediaCandidate) => (
(candidate.address && candidate.address.includes(mediaCandidate.ip))