From fa86e53b7d6ef3a59c4ee175cccf7fcc64511aec Mon Sep 17 00:00:00 2001
From: MAJigsaw77 <77043862+MAJigsaw77@users.noreply.github.com>
Date: Tue, 5 Aug 2025 14:47:12 +0300
Subject: [PATCH] Restart the video when setting the subtitle track.

---
 source/funkin/play/cutscene/VideoCutscene.hx | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/source/funkin/play/cutscene/VideoCutscene.hx b/source/funkin/play/cutscene/VideoCutscene.hx
index bfef31df3..165b0f226 100644
--- a/source/funkin/play/cutscene/VideoCutscene.hx
+++ b/source/funkin/play/cutscene/VideoCutscene.hx
@@ -10,7 +10,7 @@ import funkin.play.PlayState;
 import funkin.graphics.video.FlxVideo;
 #end
 #if hxvlc
-import hxvlc.flixel.FlxVideoSprite;
+import funkin.graphics.video.FunkinVideoSprite;
 #end
 
 /**
@@ -32,7 +32,7 @@ class VideoCutscene
   #end
 
   #if hxvlc
-  static var vid:FlxVideoSprite;
+  static var vid:FunkinVideoSprite;
   #end
 
   /**
@@ -152,7 +152,7 @@ class VideoCutscene
   static function playVideoNative(filePath:String):Void
   {
     // Video displays OVER the FlxState.
-    vid = new FlxVideoSprite(0, 0);
+    vid = new FunkinVideoSprite(0, 0);
 
     if (vid != null)
     {
@@ -170,7 +170,11 @@ class VideoCutscene
             {
               if (spuTrack.psz_name.toLowerCase().contains(DEFAULT_LANGUAGE))
               {
-                if (vid.bitmap.spuTrack != spuTrack.i_id) vid.bitmap.spuTrack = spuTrack.i_id;
+                if (vid.bitmap.spuTrack != spuTrack.i_id)
+                {
+                  vid.bitmap.spuTrack = spuTrack.i_id;
+                  vid.bitmap.time = 0;
+                }
 
                 break;
               }
@@ -184,8 +188,12 @@ class VideoCutscene
             // {
             //   if (audioTrack.psz_name.toLowerCase().contains(DEFAULT_LANGUAGE))
             //   {
-            //     if (vid.bitmap.audioTrack != audioTrack.i_id) vid.bitmap.audioTrack = audioTrack.i_id;
-            //
+            //     if (vid.bitmap.audioTrack != audioTrack.i_id)
+            //     {
+            //       vid.bitmap.audioTrack = audioTrack.i_id;
+            //       vid.bitmap.time = 0;
+            //     }
+
             //     break;
             //   }
             // }