fixed pausing desync issue

FunkinCrew · Dec 9, 2020 · 53553bc · 53553bc
1 parent 70ec82a
commit 53553bc
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/assets/music/Blammed_Inst.ogg b/assets/music/Blammed_Inst.ogg
diff --git a/assets/music/Blammed_Voices.ogg b/assets/music/Blammed_Voices.ogg
diff --git a/assets/music/Pico_Inst.ogg b/assets/music/Pico_Inst.ogg
diff --git a/assets/music/Pico_Voices.ogg b/assets/music/Pico_Voices.ogg
diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx
@@ -12,7 +12,7 @@ import lime.utils.Assets;
 
 class FreeplayState extends MusicBeatState
 {
-	var songs:Array<String> = ["Bopeebo", "Dadbattle", "Fresh", "Tutorial"];
+	var songs:Array<String> = ["Pico", "Bopeebo", "Dadbattle", "Fresh", "Tutorial"];
 
 	var selector:FlxText;
 	var curSelected:Int = 0;

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -578,9 +578,9 @@ class PlayState extends MusicBeatState
 		{
 			if (FlxG.sound.music != null)
 			{
-				vocals.time = Conductor.songPosition;
-
 				FlxG.sound.music.play();
+				Conductor.songPosition = FlxG.sound.music.time;
+				vocals.time = Conductor.songPosition;
 				vocals.play();
 			}