Merge branch 'master' into prompt-to-skip

2024-10-24 12:34:55 +03:00
parent 87f2acaf40 1e45729850
commit 459d0d7d9a
27 changed files with 1996 additions and 1324 deletions
@@ -2651,7 +2651,9 @@ export class PlaybackManager {
                    }

                    if (mediaSource.DefaultSubtitleStreamIndex == null || mediaSource.DefaultSubtitleStreamIndex < 0) {
-                        mediaSource.DefaultSubtitleStreamIndex = mediaSource.DefaultSecondarySubtitleStreamIndex;
+                        if (mediaSource.DefaultSecondarySubtitleStreamIndex != null) {
+                            mediaSource.DefaultSubtitleStreamIndex = mediaSource.DefaultSecondarySubtitleStreamIndex;
+                        }
                        mediaSource.DefaultSecondarySubtitleStreamIndex = -1;
                    }