Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix getSubtitleStreamIndex returning the wrong index #1594

Merged
merged 3 commits into from
Apr 1, 2022
Merged

fix getSubtitleStreamIndex returning the wrong index #1594

merged 3 commits into from
Apr 1, 2022

Conversation

mueslimak3r
Copy link
Member

@mueslimak3r mueslimak3r commented Apr 1, 2022 •
edited

Changes

  • in getSubtitleStreamIndex(), use index from mCurrentOptions if valid and -1 otherwise. Following the changes in fixed subtitles not clearing properly when switching (again) #1571 mDefaultSubStreamIndex isn't used to determine what's actually being used.
  • in switchSubtitleStream() only modify mCurrentOptions SubtitleStreamIndex and mDefaultSubIndex if the subtitles loaded without errors

Issues

  • if subtitles failed to load, the popup menu for choosing subtitles would show the wrong value/not have "none" selected. I assume reports to the server also used the index for the subtitles that failed to load.

@nielsvanvelzen nielsvanvelzen added this to In progress in v0.13.3 via automation Apr 1, 2022
v0.13.3 automation moved this from In progress to Reviewer approved Apr 1, 2022
@nielsvanvelzen nielsvanvelzen merged commit 5fd89ed into jellyfin:master Apr 1, 2022
v0.13.3 automation moved this from Reviewer approved to Done Apr 1, 2022
@nielsvanvelzen nielsvanvelzen moved this from Done to Cherrypicked in v0.13.3 Apr 9, 2022
nielsvanvelzen pushed a commit that referenced this pull request Apr 9, 2022
@mueslimak3r @nielsvanvelzen
fix getSubtitleStreamIndex returning the wrong index (#1594)
c568862 
* dont use mDefaultSubIndex in getSubtitleStreamIndex

* only set mCurrentOptions SubtitleStreamIndex if subtitles load without error

* clear mDefaultSubIndex in switchSubtitleStream

(cherry picked from commit 5fd89ed)
@mueslimak3r mueslimak3r deleted the get-subtitle-index-fix branch April 10, 2022 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nielsvanvelzen nielsvanvelzen nielsvanvelzen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
v0.13.3
Cherrypicked
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mueslimak3r @nielsvanvelzen