Merge pull request #46307 from RandomShaper/fix_crash_mono_glue

Make glue generation shutdown more graceful

2 files changed, 5 insertions, 3 deletions

diff --git a/main/main.cpp b/main/main.cpp
index ce9d8342c2..71dd3cf1ad 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -2576,8 +2576,10 @@ void Main::force_redraw() {
  * so that the engine closes cleanly without leaking memory or crashing.
  * The order matters as some of those steps are linked with each other.
  */
-void Main::cleanup() {
-	ERR_FAIL_COND(!_start_success);
+void Main::cleanup(bool p_force) {
+	if (!p_force) {
+		ERR_FAIL_COND(!_start_success);
+	}
 
 	EngineDebugger::deinitialize();
 
diff --git a/main/main.h b/main/main.h
index 9e606c188d..f4fff6b97e 100644
--- a/main/main.h
+++ b/main/main.h
@@ -59,7 +59,7 @@ public:
 
 	static bool is_iterating();
 
-	static void cleanup();
+	static void cleanup(bool p_force = false);
 };
 
 // Test main override is for the testing behaviour.