From 6c12efe202a0dd5b289a719e73c1ed6c9f23331b Mon Sep 17 00:00:00 2001
From: sildur <sildur@users.noreply.github.com>
Date: Tue, 2 Dec 2025 16:02:41 -0500
Subject: [PATCH] Backport pull request #7376 from jellyfin-web/release-10.11.z

Bind PlayerChange before handlers to report correct isLocalPlayer

Original-merge: 4e9c2e71a96481a1d0ef60d1d260afddc20fb932

Merged-by: thornbill <thornbill@users.noreply.github.com>

Backported-by: thornbill <thornbill@users.noreply.github.com>
---
 src/apps/stable/features/playback/utils/playbackSubscriber.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/apps/stable/features/playback/utils/playbackSubscriber.ts b/src/apps/stable/features/playback/utils/playbackSubscriber.ts
index 05c9f53fa..5a746740b 100644
--- a/src/apps/stable/features/playback/utils/playbackSubscriber.ts
+++ b/src/apps/stable/features/playback/utils/playbackSubscriber.ts
@@ -78,12 +78,14 @@ export abstract class PlaybackSubscriber {
     constructor(
         protected readonly playbackManager: PlaybackManager
     ) {
+        // Bind player events before invoking any player change handlers
+        Events.on(playbackManager, PlaybackManagerEvent.PlayerChange, this.bindPlayerEvents.bind(this));
+
         Object.entries(this.playbackManagerEvents).forEach(([event, handler]) => {
             if (handler) Events.on(playbackManager, event, handler);
         });
 
         this.bindPlayerEvents();
-        Events.on(playbackManager, PlaybackManagerEvent.PlayerChange, this.bindPlayerEvents.bind(this));
     }
 
     private bindPlayerEvents() {