Fix OSD event after player reset

jellyfin · Oct 15, 2024 · add4f20 · add4f20
1 parent b627667
commit add4f20
Showing 1 changed file with 22 additions and 15 deletions.
diff --git a/src/components/playback/skipsegment.ts b/src/components/playback/skipsegment.ts
@@ -8,6 +8,8 @@ import { EventType } from 'types/eventType';
 import './skipbutton.scss';
 import dom from 'scripts/dom';
 import globalize from 'lib/globalize';
+import { PlayTarget } from 'types/playTarget';
+import { Plugin } from 'types/plugin';
 
 interface ShowOptions {
     animate?: boolean;
@@ -23,21 +25,6 @@ class SkipSegment extends PlaybackSubscriber {
         super(playbackManager);
 
         this.onOsdChanged = this.onOsdChanged.bind(this);
-
-        Events.on(document, EventType.SHOW_VIDEO_OSD, this.onOsdChanged);
-    }
-
-    onOsdChanged(_e: Event, isOpen: boolean) {
-        if (this.currentSegment) {
-            if (isOpen) {
-                this.showSkipButton({
-                    animate: false,
-                    keep: true
-                });
-            } else if (!this.hideTimeout) {
-                this.hideSkipButton();
-            }
-        }
     }
 
     onHideComplete() {
@@ -129,6 +116,19 @@ class SkipSegment extends PlaybackSubscriber {
         }
     }
 
+    onOsdChanged(_e: Event, isOpen: boolean) {
+        if (this.currentSegment) {
+            if (isOpen) {
+                this.showSkipButton({
+                    animate: false,
+                    keep: true
+                });
+            } else if (!this.hideTimeout) {
+                this.hideSkipButton();
+            }
+        }
+    }
+
     onPromptSkip(segment: MediaSegmentDto) {
         if (!this.currentSegment) {
             this.currentSegment = segment;
@@ -152,6 +152,13 @@ class SkipSegment extends PlaybackSubscriber {
         }
     }
 
+    onPlayerChange(): void {
+        if (this.playbackManager.getCurrentPlayer()) {
+            Events.off(document, EventType.SHOW_VIDEO_OSD, this.onOsdChanged);
+            Events.on(document, EventType.SHOW_VIDEO_OSD, this.onOsdChanged);
+        }
+    }
+
     onPlaybackStop() {
         this.currentSegment = null;
         this.hideSkipButton();