Skip to content

Commit 4917da2

Browse files
committed
fixed: disabled caption to no longer automatically re-enable on new player instance.
1 parent 6e81f24 commit 4917da2

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

app/src/main/java/org/schabi/newpipe/player/Player.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3557,14 +3557,19 @@ private void buildCaptionMenu(@NonNull final List<String> availableLanguages) {
35573557
}
35583558

35593559
// apply caption language from previous user preference
3560-
final List<String> selectedPreferredLanguages =
3561-
trackSelector.getParameters().preferredTextLanguages;
35623560
final String userPreferredLanguage =
35633561
prefs.getString(context.getString(R.string.caption_user_set_key), null);
35643562
final int textRendererIndex = getCaptionRendererIndex();
35653563

3566-
if (userPreferredLanguage != null
3567-
&& !selectedPreferredLanguages.contains(userPreferredLanguage)
3564+
if (userPreferredLanguage == null) {
3565+
trackSelector.setParameters(trackSelector.buildUponParameters()
3566+
.setRendererDisabled(textRendererIndex, true));
3567+
return;
3568+
}
3569+
3570+
final List<String> selectedPreferredLanguages =
3571+
trackSelector.getParameters().preferredTextLanguages;
3572+
if (!selectedPreferredLanguages.contains(userPreferredLanguage)
35683573
&& textRendererIndex != RENDERER_UNAVAILABLE) {
35693574
trackSelector.setParameters(trackSelector.buildUponParameters()
35703575
.setPreferredTextLanguages(userPreferredLanguage,

0 commit comments

Comments
 (0)