From 01e1345a8911acf60855a6d2f5616e1eebc83343 Mon Sep 17 00:00:00 2001 From: thornbill Date: Tue, 21 Oct 2025 15:51:05 -0400 Subject: [PATCH] Backport pull request #7219 from jellyfin-web/release-10.11.z Fix skip button not displaying correctly with OSD (#6583) Original-merge: 81698d5da77c6d2f93f5dd6b38a642fb46d66c72 Merged-by: thornbill Backported-by: thornbill --- src/components/playback/skipsegment.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/playback/skipsegment.ts b/src/components/playback/skipsegment.ts index eb49c470d..f5e1d5e18 100644 --- a/src/components/playback/skipsegment.ts +++ b/src/components/playback/skipsegment.ts @@ -1,6 +1,7 @@ import { PlaybackManager } from './playbackmanager'; import { TICKS_PER_MILLISECOND, TICKS_PER_SECOND } from 'constants/time'; import type { MediaSegmentDto } from '@jellyfin/sdk/lib/generated-client/models/media-segment-dto'; +import type { PlaybackStopInfo } from 'types/playbackStopInfo'; import { PlaybackSubscriber } from 'apps/stable/features/playback/utils/playbackSubscriber'; import { isInSegment } from 'apps/stable/features/playback/utils/mediaSegments'; import Events, { type Event } from 'utils/events'; @@ -188,10 +189,12 @@ class SkipSegment extends PlaybackSubscriber { } } - onPlaybackStop() { + onPlaybackStop(_e: Event, playbackStopInfo: PlaybackStopInfo) { this.currentSegment = null; this.hideSkipButton(); - Events.off(document, EventType.SHOW_VIDEO_OSD, this.onOsdChanged); + if (!playbackStopInfo.nextItem) { + Events.off(document, EventType.SHOW_VIDEO_OSD, this.onOsdChanged); + } } }