2 files changed, 3 insertions, 2 deletions
diff --git a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js
index 741aa7a..a429b45 100644
--- a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js
+++ b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js
@@ -125,6 +125,7 @@ class FullscreenVideo extends Component {
           playing={playing}
           duration={element.duration}
           timing={this.state}
+          mediaItem={item}
           cc={cc}
           onScrub={this.handleScrub}
         />
diff --git a/animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js b/animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js
index b083e29..4fef8d6 100644
--- a/animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js
+++ b/animism-align/frontend/app/views/viewer/player/components.media/video.scrubber.js
@@ -104,7 +104,7 @@ class VideoScrubber extends Component {
     clearTimeout(this.hideTimeout)
   }
   render() {
-    const { playing, start_ts, play_ts, volume, timing, video_start_ts, duration, cc } = this.props
+    const { playing, start_ts, play_ts, volume, timing, video_start_ts, duration, cc, mediaItem } = this.props
     const { hovering, showing } = this.state
     // remove video start offset from timing
     // console.log(start_ts, play_ts)
@@ -145,7 +145,7 @@ class VideoScrubber extends Component {
             {timestampText}
           </div>
           <VolumeControl volume={volume} />
-          <SubtitleButton cc={cc} />
+          {mediaItem.settings.subtitles && <SubtitleButton cc={cc} />}
         </div>
       </div>
     )