Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #401 from havfo/feat-network-indicator 

Fix crash when extra video is running
auto_join_3.3
Håvar Aambø Fosstveit 2020-05-20 20:17:22 +02:00 committed by GitHub
parent d75d2154f2 e301474906
commit 27eeadbe84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/components/Containers/Me.js
View File

@ -817,6 +817,7 @@ const Me = (props) =>
<VideoView <VideoView
isMe isMe
isExtraVideo
advancedMode={advancedMode} advancedMode={advancedMode}
peer={me} peer={me}
displayName={settings.displayName} displayName={settings.displayName}

8
app/src/components/VideoContainers/VideoView.js
View File

@ -187,8 +187,9 @@ class VideoView extends React.PureComponent
{ {
const { const {
isMe, isMe,
showQuality,
isScreen, isScreen,
isExtraVideo,
showQuality,
displayName, displayName,
showPeerInfo, showPeerInfo,
videoContain, videoContain,
@ -307,7 +308,7 @@ class VideoView extends React.PureComponent
</React.Fragment> </React.Fragment>
} }
{ isMe && !isScreen && { isMe && !isScreen && !isExtraVideo &&
(netInfo.recv && netInfo.send && netInfo.send.iceSelectedTuple) && (netInfo.recv && netInfo.send && netInfo.send.iceSelectedTuple) &&
<React.Fragment> <React.Fragment>
<span className={'RecvL'}>Recv: </span> <span className={'RecvL'}>Recv: </span>
@ -533,8 +534,9 @@ class VideoView extends React.PureComponent
VideoView.propTypes = VideoView.propTypes =
{ {
isMe : PropTypes.bool, isMe : PropTypes.bool,
showQuality : PropTypes.bool,
isScreen : PropTypes.bool, isScreen : PropTypes.bool,
isExtraVideo : PropTypes.bool,
showQuality : PropTypes.bool,
displayName : PropTypes.string, displayName : PropTypes.string,
showPeerInfo : PropTypes.bool, showPeerInfo : PropTypes.bool,
videoContain : PropTypes.bool, videoContain : PropTypes.bool,