1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

Merge branch 'master' into prompt-to-skip

This commit is contained in:
viown 2024-10-24 12:34:55 +03:00
commit 459d0d7d9a
27 changed files with 1996 additions and 1324 deletions

View file

@ -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;
}