From 895eeed852b51a90000caef3c8b87132ec49c2ea Mon Sep 17 00:00:00 2001
From: MAJigsaw77 <77043862+MAJigsaw77@users.noreply.github.com>
Date: Thu, 12 Jun 2025 17:56:26 +0300
Subject: [PATCH] fix: restart on video cutscenes.

---
 source/funkin/play/cutscene/VideoCutscene.hx | 10 +++++++---
 source/funkin/ui/charSelect/IntroSubState.hx |  6 +++++-
 source/funkin/ui/title/AttractState.hx       |  6 +++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/source/funkin/play/cutscene/VideoCutscene.hx b/source/funkin/play/cutscene/VideoCutscene.hx
index 778a9980a..ab42d2dc2 100644
--- a/source/funkin/play/cutscene/VideoCutscene.hx
+++ b/source/funkin/play/cutscene/VideoCutscene.hx
@@ -150,7 +150,11 @@ class VideoCutscene
     {
       vid.zIndex = 0;
       vid.active = false;
-      vid.bitmap.onEncounteredError.add((_) -> finishVideo(0.5));
+      vid.bitmap.onEncounteredError.add(function(msg:String):Void {
+        trace('[VLC] Encountered an error: $msg');
+
+        finishVideo(0.5);
+      });
       vid.bitmap.onEndReached.add(finishVideo.bind(0.5));
 
       vid.cameras = [PlayState.instance.camCutscene];
@@ -192,8 +196,8 @@ class VideoCutscene
     #if hxvlc
     if (vid != null)
     {
-      vid.stop();
-      vid.play();
+      vid.bitmap.time = 0;
+      vid.resume();
       onVideoRestarted.dispatch();
     }
     #end
diff --git a/source/funkin/ui/charSelect/IntroSubState.hx b/source/funkin/ui/charSelect/IntroSubState.hx
index a945581e5..3f7a28a36 100644
--- a/source/funkin/ui/charSelect/IntroSubState.hx
+++ b/source/funkin/ui/charSelect/IntroSubState.hx
@@ -90,7 +90,11 @@ class IntroSubState extends MusicBeatSubState
     {
       vid.zIndex = 0;
       vid.active = false;
-      vid.bitmap.onEncounteredError.add((_) -> onLightsEnd());
+      vid.bitmap.onEncounteredError.add(function(msg:String):Void {
+        trace('[VLC] Encountered an error: $msg');
+
+        onLightsEnd();
+      });
       vid.bitmap.onEndReached.add(onLightsEnd);
       vid.bitmap.onFormatSetup.add(() -> {
         vid.setGraphicSize(FlxG.initialWidth, FlxG.initialHeight);
diff --git a/source/funkin/ui/title/AttractState.hx b/source/funkin/ui/title/AttractState.hx
index b0822b265..8d30bdb1b 100644
--- a/source/funkin/ui/title/AttractState.hx
+++ b/source/funkin/ui/title/AttractState.hx
@@ -97,7 +97,11 @@ class AttractState extends MusicBeatState
     {
       vid.zIndex = 0;
       vid.active = false;
-      vid.bitmap.onEncounteredError.add((_) -> onAttractEnd());
+      vid.bitmap.onEncounteredError.add(function(msg:String):Void {
+        trace('[VLC] Encountered an error: $msg');
+
+        onAttractEnd();
+      });
       vid.bitmap.onEndReached.add(onAttractEnd);
       vid.bitmap.onFormatSetup.add(() -> {
         vid.setGraphicSize(FlxG.initialWidth, FlxG.initialHeight);