Merge remote-tracking branch 'upstream/main'

Do not try to update an undefined video element (#27798 )
2023-11-10 00:29:32 +01:00 · 2023-11-09 22:35:53 +00:00
1 changed files with 4 additions and 0 deletions
--- a/app/javascript/mastodon/features/video/index.jsx
+++ b/app/javascript/mastodon/features/video/index.jsx
@ -469,6 +469,10 @@ class Video extends PureComponent {
  };

  _syncVideoToVolumeState = (volume = null, muted = null) => {
+    if (!this.video) {
+      return;
+    }
+
    this.video.volume = volume ?? this.state.volume;
    this.video.muted = muted ?? this.state.muted;
  };
Author	SHA1	Message	Date
Dalite Fur	c07ddbe7b1	Merge remote-tracking branch 'upstream/main' All checks were successful continuous-integration/drone Build is passing Details	2023-11-10 00:29:32 +01:00
Aleks Xhuvani	7840c6b75b	Do not try to update an undefined video element (#27798 )	2023-11-09 22:35:53 +00:00