From a83d4b03dc0aa786397f000499dc0a3e39b5859e Mon Sep 17 00:00:00 2001
From: jgriff6 <74262798+jgriff6@users.noreply.github.com>
Date: Tue, 11 Oct 2022 18:36:19 +0100
Subject: [PATCH] Make 'Always' subtitle mode prioritise full tracks

---
 Emby.Server.Implementations/Library/MediaStreamSelector.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Emby.Server.Implementations/Library/MediaStreamSelector.cs b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
index c77290aebf..609b957727 100644
--- a/Emby.Server.Implementations/Library/MediaStreamSelector.cs
+++ b/Emby.Server.Implementations/Library/MediaStreamSelector.cs
@@ -71,8 +71,8 @@ namespace Emby.Server.Implementations.Library
             }
             else if (mode == SubtitlePlaybackMode.Always)
             {
-                // Always load subtitles of the user's preferred subtitle language if possible, otherwise default behaviour.
-                stream = sortedStreams.FirstOrDefault(x => preferredLanguages.Contains(x.Language, StringComparison.OrdinalIgnoreCase)) ??
+                // Always load (full/non-forced) subtitles of the user's preferred subtitle language if possible, otherwise default behaviour.
+                stream = sortedStreams.FirstOrDefault(x => !x.IsForced && preferredLanguages.Contains(x.Language, StringComparison.OrdinalIgnoreCase)) ??
                     sortedStreams.FirstOrDefault(x => x.IsExternal || x.IsForced || x.IsDefault);
             }
             else if (mode == SubtitlePlaybackMode.OnlyForced)