From c8566c70a6f8a1ab3a96c82ea1c28a331b23c90a Mon Sep 17 00:00:00 2001
From: Niels van Velzen <git@ndat.nl>
Date: Sun, 20 Oct 2024 10:56:15 +0200
Subject: [PATCH] Fix not disabling embedded subtitle tracks that require
 baking

---
 .../jellyfin/androidtv/ui/playback/PlaybackController.java   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java
index 0904bd75f6..f17de7befa 100644
--- a/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java
+++ b/app/src/main/java/org/jellyfin/androidtv/ui/playback/PlaybackController.java
@@ -1098,10 +1098,7 @@ public void onPrepared() {
             if (!burningSubs) {
                 // Make sure the requested subtitles are enabled when external/embedded
                 Integer currentSubtitleIndex = mCurrentOptions.getSubtitleStreamIndex();
-
-                if (currentSubtitleIndex != null && currentSubtitleIndex != -1) {
-                    PlaybackControllerHelperKt.setSubtitleIndex(this, currentSubtitleIndex, true);
-                }
+                PlaybackControllerHelperKt.setSubtitleIndex(this, currentSubtitleIndex, true);
             }
 
             // select an audio track