From 0d1358d6cbaba216947033100a67acbace194950 Mon Sep 17 00:00:00 2001
From: "Timothy Z." <timothy@stremio.com>
Date: Thu, 23 Apr 2026 19:47:32 +0200
Subject: [PATCH] fix: correctly use track for selection

---
 .../Player/SubtitlesMenu/SubtitleVariant/SubtitleVariant.tsx | 5 ++++-
 src/routes/Player/SubtitlesMenu/SubtitlesMenu.js             | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/routes/Player/SubtitlesMenu/SubtitleVariant/SubtitleVariant.tsx b/src/routes/Player/SubtitlesMenu/SubtitleVariant/SubtitleVariant.tsx
index 4f7134c6e..9bd8f909c 100644
--- a/src/routes/Player/SubtitlesMenu/SubtitleVariant/SubtitleVariant.tsx
+++ b/src/routes/Player/SubtitlesMenu/SubtitleVariant/SubtitleVariant.tsx
@@ -39,6 +39,9 @@ const SubtitleVariant = ({ track, selected, onSelect }: Props) => {
     const variantLabel = hasValidLabel(track.label) ? track.label : languages.label(track.lang);
     const downloadFileName = hasValidLabel(track.label) ? track.label : `subtitle-${track.lang || 'unknown'}`;
     const canCopyUrl = typeof downloadUrl === 'string' && !downloadUrl.startsWith('blob:');
+    const hoverTitle = hasValidLabel(track.label)
+        ? track.label
+        : downloadUrl?.split('/').pop()?.split('?')[0] || variantLabel;
 
     const onSelectClick = useCallback(() => {
         onSelect(track);
@@ -65,7 +68,7 @@ const SubtitleVariant = ({ track, selected, onSelect }: Props) => {
     return (
         <Button
             ref={buttonRef}
-            title={variantLabel}
+            title={hoverTitle}
             onClick={onSelectClick}
             className={classNames(styles['variant-option'], { 'selected': selected })}
         >
diff --git a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
index d72f3cd76..a71969bd5 100644
--- a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
+++ b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js
@@ -106,11 +106,11 @@ const SubtitlesMenu = React.memo(React.forwardRef((props, ref) => {
     const subtitlesTrackOnSelect = React.useCallback((track) => {
         if (track.embedded) {
             if (typeof props.onSubtitlesTrackSelected === 'function') {
-                props.onSubtitlesTrackSelected(track.id);
+                props.onSubtitlesTrackSelected(track);
             }
         } else {
             if (typeof props.onExtraSubtitlesTrackSelected === 'function') {
-                props.onExtraSubtitlesTrackSelected(track.id);
+                props.onExtraSubtitlesTrackSelected(track);
             }
         }
     }, [props.onSubtitlesTrackSelected, props.onExtraSubtitlesTrackSelected]);