1 files changed, 12 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index a9ce5ba54..7e2f41ef9 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -680,7 +680,7 @@ namespace MediaBrowser.Server.Implementations.Session
 
                 foreach (var user in users)
                 {
-                    await OnPlaybackProgress(user.Id, key, libraryItem, info.PositionTicks).ConfigureAwait(false);
+                    await OnPlaybackProgress(user.Id, key, libraryItem, info).ConfigureAwait(false);
                 }
             }
 
@@ -712,18 +712,28 @@ namespace MediaBrowser.Server.Implementations.Session
             StartIdleCheckTimer();
         }
 
-        private async Task OnPlaybackProgress(Guid userId, string userDataKey, BaseItem item, long? positionTicks)
+        private async Task OnPlaybackProgress(Guid userId, string userDataKey, BaseItem item, PlaybackProgressInfo info)
         {
             var data = _userDataRepository.GetUserData(userId, userDataKey);
 
+            var positionTicks = info.PositionTicks;
+
             if (positionTicks.HasValue)
             {
                 _userDataRepository.UpdatePlayState(item, data, positionTicks.Value);
 
+                UpdatePlaybackSettings(info, data);
+
                 await _userDataRepository.SaveUserData(userId, item, data, UserDataSaveReason.PlaybackProgress, CancellationToken.None).ConfigureAwait(false);
             }
         }
 
+        private void UpdatePlaybackSettings(PlaybackProgressInfo info, UserItemData data)
+        {
+            data.AudioStreamIndex = info.AudioStreamIndex;
+            data.SubtitleStreamIndex = info.SubtitleStreamIndex;
+        }
+
         /// <summary>
         /// Used to report that playback has ended for an item
         /// </summary>