fix broken transition exit animation

MaybeMaru · Apr 10, 2024 · 31d5b85 · 31d5b85
1 parent d610b69
commit 31d5b85
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/source/funkin/states/MusicBeatState.hx b/source/funkin/states/MusicBeatState.hx
@@ -50,8 +50,8 @@ class MusicBeatState extends FlxUIState implements IMusicGetter {
 			ModdingUtil.addCall('stateCreate');
 		}
 
-		if (Main.transition != null)
-			Main.transition.exitTrans();
+		if (Main.transition != null) // Make sure it runs after all of create is loaded in
+			FlxG.signals.postUpdate.addOnce(() -> Main.transition.exitTrans());
 	}
 
 	// Only for backwards compatibility

diff --git a/source/funkin/util/CoolUtil.hx b/source/funkin/util/CoolUtil.hx
@@ -120,6 +120,13 @@ class CoolUtil {
 
 		gc(true);
 	}
+
+	inline public static function enableGc(enable:Bool = true)
+	{
+		#if (cpp || hl)
+		Gc.enable(enable);
+		#end
+	}
 
 	inline public static function gc(major:Bool = false) {
 		#if (cpp || hl || neko)

diff --git a/source/funkin/util/backend/AssetManager.hx b/source/funkin/util/backend/AssetManager.hx
@@ -265,6 +265,8 @@ class AssetManager
 			}
 		}
 
+		CoolUtil.enableGc(false);
+
 		if (stageImages.length > 0)
 			FunkThread.run(() -> cacheImages(stageImages));
 
@@ -305,6 +307,7 @@ class AssetManager
 		sounds.clear();
 		sounds = null;
 
+		CoolUtil.enableGc(true);
 		CoolUtil.gc(true);
 
 		if (onComplete != null)