From 1040685c1ea026940b320381d03441fd58a83e25 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sun, 12 Feb 2023 19:25:15 +0300
Subject: [PATCH] Fix subtitle offset reset when seeking progressive stream

---
 src/components/playback/playbackmanager.js | 1 +
 src/plugins/htmlVideoPlayer/plugin.js      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 8c6bced1eb..7cf0bc62eb 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -1677,6 +1677,7 @@ class PlaybackManager {
                         const streamInfo = createStreamInfo(apiClient, currentItem.MediaType, currentItem, currentMediaSource, ticks, player);
                         streamInfo.fullscreen = currentPlayOptions.fullscreen;
                         streamInfo.lastMediaInfoQuery = lastMediaInfoQuery;
+                        streamInfo.resetSubtitleOffset = false;
 
                         if (!streamInfo.url) {
                             showPlaybackInfoErrorMessage(self, 'PlaybackErrorNoCompatibleStream');
diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js
index dab9501ebd..7a2e5ff98d 100644
--- a/src/plugins/htmlVideoPlayer/plugin.js
+++ b/src/plugins/htmlVideoPlayer/plugin.js
@@ -365,7 +365,7 @@ function tryRemoveElement(elem) {
 
             this.#currentTime = null;
 
-            this.resetSubtitleOffset();
+            if (options.resetSubtitleOffset !== false) this.resetSubtitleOffset();
 
             return this.createMediaElement(options).then(elem => {
                 return this.updateVideoUrl(options).then(() => {