Merge remote-tracking branch 'public/bugfix/crash-handler-flxstate-ch…

…eck' into bugfix/public-fixes
FunkinCrew · May 9, 2024 · 0b82a20 · 0b82a20
2 parents 34a6e16 + be07760
commit 0b82a20
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/source/funkin/util/logging/CrashHandler.hx b/source/funkin/util/logging/CrashHandler.hx
@@ -141,7 +141,9 @@ class CrashHandler
 
     fullContents += '\n';
 
-    fullContents += 'Flixel Current State: ${Type.getClassName(Type.getClass(FlxG.state))}\n';
+    var currentState = FlxG.state != null ? Type.getClassName(Type.getClass(FlxG.state)) : 'No state loaded';
+
+    fullContents += 'Flixel Current State: ${currentState}\n';
 
     fullContents += '\n';