From 27723e6f299636d5d9060b05d4decbc68d6a7a81 Mon Sep 17 00:00:00 2001
From: edde746 <86283021+edde746@users.noreply.github.com>
Date: Mon, 15 Jun 2026 12:05:29 +0200
Subject: [PATCH] fix(video): sync first-frame background state

---
 lib/mpv/video.dart                        | 51 ++++++++++++++++++++---
 lib/screens/video_player/parts/build.dart |  1 +
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/lib/mpv/video.dart b/lib/mpv/video.dart
index 09659b4f..b7995395 100644
--- a/lib/mpv/video.dart
+++ b/lib/mpv/video.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 import 'player/player.dart';
@@ -23,8 +24,15 @@ class Video extends StatefulWidget {
   final Player player;
   final Widget Function(BuildContext context)? controls;
   final Color backgroundColor;
+  final ValueListenable<bool>? hasFirstFrame;
 
-  const Video({super.key, required this.player, this.controls, this.backgroundColor = Colors.black});
+  const Video({
+    super.key,
+    required this.player,
+    this.controls,
+    this.backgroundColor = Colors.black,
+    this.hasFirstFrame,
+  });
 
   @override
   State<Video> createState() => _VideoState();
@@ -38,19 +46,50 @@ class _VideoState extends State<Video> {
   @override
   void initState() {
     super.initState();
-    _playbackRestartSubscription = widget.player.streams.playbackRestart.listen((_) {
-      if (!_hasFirstFrame && mounted) {
-        setState(() => _hasFirstFrame = true);
-      }
-    });
+    _hasFirstFrame = widget.hasFirstFrame?.value ?? false;
+    widget.hasFirstFrame?.addListener(_syncExternalFirstFrame);
+    _listenForPlaybackRestart();
+  }
+
+  @override
+  void didUpdateWidget(covariant Video oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.hasFirstFrame != widget.hasFirstFrame) {
+      oldWidget.hasFirstFrame?.removeListener(_syncExternalFirstFrame);
+      widget.hasFirstFrame?.addListener(_syncExternalFirstFrame);
+      _syncExternalFirstFrame();
+    }
+    if (oldWidget.player != widget.player) {
+      _playbackRestartSubscription?.cancel();
+      _listenForPlaybackRestart();
+      _syncExternalFirstFrame();
+    }
   }
 
   @override
   void dispose() {
+    widget.hasFirstFrame?.removeListener(_syncExternalFirstFrame);
     _playbackRestartSubscription?.cancel();
     super.dispose();
   }
 
+  void _listenForPlaybackRestart() {
+    _playbackRestartSubscription = widget.player.streams.playbackRestart.listen((_) {
+      _setHasFirstFrame(true);
+    });
+  }
+
+  void _syncExternalFirstFrame() {
+    final external = widget.hasFirstFrame;
+    if (external == null) return;
+    _setHasFirstFrame(external.value);
+  }
+
+  void _setHasFirstFrame(bool value) {
+    if (_hasFirstFrame == value || !mounted) return;
+    setState(() => _hasFirstFrame = value);
+  }
+
   @override
   Widget build(BuildContext context) {
     return ColoredBox(
diff --git a/lib/screens/video_player/parts/build.dart b/lib/screens/video_player/parts/build.dart
index 9e510b87..b49d29e8 100644
--- a/lib/screens/video_player/parts/build.dart
+++ b/lib/screens/video_player/parts/build.dart
@@ -256,6 +256,7 @@ extension _VideoPlayerBuildMethods on VideoPlayerScreenState {
 
                     return Video(
                       player: player!,
+                      hasFirstFrame: _hasFirstFrame,
                       controls: (context) => PlexVideoControls(
                         player: player!,
                         metadata: _currentMetadata,