Skip to content

Commit af92002

Browse files
committed
fix: octopus isn't cleared on track changes
1 parent 70d971c commit af92002

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

resources/js/components/video/subtitles/PlayerSubtitles.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,18 @@ const handleSubtitles = (track?: SubtitleResource) => {
112112
isShowingSubtitles.value = !!nextTrack;
113113
subtitlesPopover.value?.handleClose();
114114
115-
if (currentSubtitleTrack.value?.track_id === nextTrack?.track_id) return;
115+
if (currentSubtitleTrack.value?.track_id === nextTrack?.track_id || !player?.value) {
116+
clearOctopus();
117+
return;
118+
}
116119
117120
currentSubtitleTrack.value = nextTrack;
118121
119-
if (!player?.value) return;
120-
121122
if (nextTrack?.codec === 'ass') {
122123
instantiateOctopus(`/data/subtitles/${nextTrack.metadata_uuid}/${nextTrack.track_id}${nextTrack.track_id === 0 ? `.${nextTrack.language}` : ''}.ass`);
123124
hideAllTracks();
124125
} else {
126+
clearOctopus();
125127
for (const textTrack of player.value.textTracks) {
126128
textTrack.mode = isShowingSubtitles.value && textTrack.language === currentSubtitleTrack.value?.language ? 'showing' : 'hidden';
127129
}

0 commit comments

Comments
 (0)