aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorllaforest <l.laforest@gmail.com>2026-05-04 13:24:43 -0400
committerllaforest <l.laforest@gmail.com>2026-05-04 13:26:08 -0400
commit6ea2f05497efa6e8fce8e88be12f5385c1e2600d (patch)
treedf8eba5908eb6fc198de72a4a3cfc5e62cd71fe7
parent622947e37425f3620432995cde5d4a0809d91694 (diff)
Guard against null-overwrite of saved audio/subtitle track selections
Some clients omit AudioStreamIndex or SubtitleStreamIndex in playback progress reports and it causes previously saved track selections to be erased. Add .HasValue checks so only explicit track changes are persisted.
-rw-r--r--Emby.Server.Implementations/Session/SessionManager.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index e2ddf86c7a..5652d0c9b5 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -973,7 +973,7 @@ namespace Emby.Server.Implementations.Session
if (user.RememberAudioSelections)
{
- if (data.AudioStreamIndex != info.AudioStreamIndex)
+ if (info.AudioStreamIndex.HasValue && data.AudioStreamIndex != info.AudioStreamIndex)
{
data.AudioStreamIndex = info.AudioStreamIndex;
changed = true;
@@ -990,7 +990,7 @@ namespace Emby.Server.Implementations.Session
if (user.RememberSubtitleSelections)
{
- if (data.SubtitleStreamIndex != info.SubtitleStreamIndex)
+ if (info.SubtitleStreamIndex.HasValue && data.SubtitleStreamIndex != info.SubtitleStreamIndex)
{
data.SubtitleStreamIndex = info.SubtitleStreamIndex;
changed = true;