From 3667c51c1efe14cfe7c810e2f35991f08f50781a Mon Sep 17 00:00:00 2001
From: Kolo <67389779+JustKolosaki@users.noreply.github.com>
Date: Thu, 13 Mar 2025 17:57:32 +0100
Subject: [PATCH] prevent unnecessary resync

---
 source/funkin/play/PlayState.hx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index fd35690a7..3b221fdd5 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -917,6 +917,9 @@ class PlayState extends MusicBeatSubState
       }
 
       Conductor.instance.update(Conductor.instance.songPosition + elapsed * 1000, false); // Normal conductor update.
+
+      // Fallback in case music's onComplete function doesn't get called.
+      if (FlxG.sound.music.time >= (FlxG.sound.music.endTime ?? FlxG.sound.music.length) && mayPauseGame) endSong(skipEndingTransition);
     }
 
     var androidPause:Bool = false;
@@ -1440,7 +1443,7 @@ class PlayState extends MusicBeatSubState
       var playerVoicesError:Float = 0;
       var opponentVoicesError:Float = 0;
 
-      if (vocals != null)
+      if (vocals != null && vocals.playing)
       {
         @:privateAccess // todo: maybe make the groups public :thinking:
         {