From 2f9db0fe5479f90401205a0896ed3ff7f13fcfa0 Mon Sep 17 00:00:00 2001
From: ThaUnknown <6506529+ThaUnknown@users.noreply.github.com>
Date: Wed, 17 Apr 2024 21:25:41 +0200
Subject: [PATCH] fix: subtitle negative offset fix: go back episode on media
with no episodes
---
common/views/Player/MediaHandler.svelte | 4 +++-
common/views/Player/Player.svelte | 4 ++--
common/views/Settings/TorrentSettings.svelte | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/common/views/Player/MediaHandler.svelte b/common/views/Player/MediaHandler.svelte
index 233c09d8..949e46a7 100644
--- a/common/views/Player/MediaHandler.svelte
+++ b/common/views/Player/MediaHandler.svelte
@@ -36,7 +36,9 @@
const fileList = files.value
- const targetFile = fileList.find(file => file.media?.media?.id === obj.media.id && (obj.media.episodes === 1 || !obj.media.episodes || file.media?.episode === obj.episode))
+ const targetFile = fileList.find(file => file.media?.media?.id === obj.media.id &&
+ (file.media?.episode === obj.episode || obj.media.episodes === 1 || (!obj.media.episodes && (obj.episode === 1 || !obj.episode) && (oldNowPlaying.episode === 1 || !oldNowPlaying.episode))) // movie check
+ )
if (!targetFile) return false
if (oldNowPlaying.media?.id !== obj.media.id) {
// mediachange, filelist change
diff --git a/common/views/Player/Player.svelte b/common/views/Player/Player.svelte
index 075ba2c9..d1fa9f19 100644
--- a/common/views/Player/Player.svelte
+++ b/common/views/Player/Player.svelte
@@ -245,7 +245,7 @@
let subDelay = 0
$: updateDelay(subDelay)
function updateDelay (delay) {
- if (subs?.renderer) subs.renderer.timeOffset = delay
+ if (subs?.renderer) subs.renderer.timeOffset = Number(delay)
}
let currentTime = 0
@@ -1177,7 +1177,7 @@
{/if}
{/each}
-
+
{/if}
diff --git a/common/views/Settings/TorrentSettings.svelte b/common/views/Settings/TorrentSettings.svelte
index fe41fc48..3e3ce690 100644
--- a/common/views/Settings/TorrentSettings.svelte
+++ b/common/views/Settings/TorrentSettings.svelte
@@ -161,7 +161,7 @@
{/if}