OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5368 from matrix-org/hs/fix-video-bug 

Fix videos not playing in non-encrypted rooms
pull/21833/head
Will Hunt 2020-10-30 11:59:59 +00:00 committed by GitHub
parent d10234740b c8485419c1
commit 428a2de930
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/messages/MVideoBody.tsx
View File

@ -143,9 +143,8 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
} }
async _videoOnPlay() { async _videoOnPlay() {
const autoplay = SettingsStore.getValue("autoplayGifsAndVideos") as boolean; if (this._getContentUrl() || this.state.fetchingData || this.state.error) {
if (autoplay || this.state.decryptedUrl || this.state.fetchingData || this.state.error) { // We have the file, we are fetching the file, or there is an error.
// The video has or will have the data.
return; return;
} }
this.setState({ this.setState({
@ -164,6 +163,7 @@ export default class MVideoBody extends React.PureComponent<IProps, IState> {
this.setState({ this.setState({
decryptedUrl: contentUrl, decryptedUrl: contentUrl,
decryptedBlob: decryptedBlob, decryptedBlob: decryptedBlob,
fetchingData: false,
}); });
this.props.onHeightChanged(); this.props.onHeightChanged();
} }