Skip to content
Browse files

Fixed regression for "Definitely disable subtitles" introduced in 4e0…

  • Loading branch information...
1 parent 6330a93 commit 4675d5f919e7c905917ab40348387dce9515e142 @Raptor399 Raptor399 committed Nov 7, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/main/java/net/pms/encoders/Player.java
View
2 src/main/java/net/pms/encoders/Player.java
@@ -245,7 +245,7 @@ public void setAudioAndSubs(String fileName, DLNAMediaInfo media, OutputParams p
}
if (matchedSub != null && params.sid == null) {
- if (matchedSub.getLang() != null && matchedSub.getLang().equals("off")) {
+ if (configuration.isMencoderDisableSubs() || (matchedSub.getLang() != null && matchedSub.getLang().equals("off"))) {
logger.trace(" Disabled the subtitles: " + matchedSub);
} else {
params.sid = matchedSub;

0 comments on commit 4675d5f

Please sign in to comment.
Something went wrong with that request. Please try again.