Merge pull request #92060 from raulsntos/core/memdelete-engine-later

Release Engine after unregistering GDExtensions
godotengine · May 18, 2024 · 7437b9a · 7437b9a
2 parents 337e5da + e516479
commit 7437b9a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/main/main.cpp b/main/main.cpp
@@ -4295,9 +4295,6 @@ void Main::cleanup(bool p_force) {
 	if (globals) {
 		memdelete(globals);
 	}
-	if (engine) {
-		memdelete(engine);
-	}
 
 	if (OS::get_singleton()->is_restart_on_exit_set()) {
 		//attempt to restart with arguments
@@ -4315,6 +4312,10 @@ void Main::cleanup(bool p_force) {
 	uninitialize_modules(MODULE_INITIALIZATION_LEVEL_CORE);
 	unregister_core_types();
 
+	if (engine) {
+		memdelete(engine);
+	}
+
 	OS::get_singleton()->benchmark_end_measure("Shutdown", "Total");
 	OS::get_singleton()->benchmark_dump();