Fixed crash with a custom MainLoop or with --check-only

DmitriySalnikov · Nov 13, 2024 · 742443c · 742443c
1 parent 4006fc2
commit 742443c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/debug_draw_manager.cpp b/src/debug_draw_manager.cpp
@@ -233,6 +233,12 @@ void DebugDrawManager::_unregister_singleton_aliases(const TypedArray<StringName
 void DebugDrawManager::_integrate_into_engine() {
 	ZoneScoped;
 
+	if (!SCENE_TREE()) {
+		// Running via the console with a custom `MainLoop` or with `--check-only`
+		set_debug_enabled(false);
+		return;
+	}
+
 	// disable by default for headless
 	{
 		if (Engine::get_singleton()->has_singleton("DisplayServer")) {

diff --git a/src/register_types.cpp b/src/register_types.cpp
@@ -91,7 +91,7 @@ void uninitialize_debug_draw_3d_module(ModuleInitializationLevel p_level) {
 		// If this library is disabled manually before deleting the scene tree (hot-reload),
 		// then an attempt is made to delete this node manually.
 		DebugDrawManager *debug_draw_manager = Object::cast_to<DebugDrawManager>(ObjectDB::get_instance(debug_draw_manager_id));
-		if (Engine::get_singleton()->get_main_loop() && debug_draw_manager) {
+		if (debug_draw_manager) {
 			memdelete(debug_draw_manager);
 		}
 		debug_draw_manager_id = 0;