used macro, updated ci

DmitriySalnikov · Mar 31, 2024 · ab3718c · ab3718c
1 parent f8737cc
commit ab3718c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/.github/actions/compile_gdextension/action.yml b/.github/actions/compile_gdextension/action.yml
@@ -33,7 +33,7 @@ inputs:
     description: Secrets token
   telemetry_version:
     description: Telemetry version
-    default: 999c64d0e0fc4c51f64130728eec33805721f4aa
+    default: 92c1c576739703018a935417cdc7a6ff210b7975
 runs:
   using: composite
   steps:

diff --git a/src/3d/debug_geometry_container.cpp b/src/3d/debug_geometry_container.cpp
@@ -232,7 +232,7 @@ void DebugGeometryContainer::update_geometry(double p_delta) {
 										custom_editor_viewports.cend(),
 										[&vp_p](const auto &it) { return it == vp_p; }) != custom_editor_viewports.cend();
 
-			if (Engine::get_singleton()->is_editor_hint() && is_editor_vp) {
+			if (IS_EDITOR_HINT() && is_editor_vp) {
 				Camera3D *cam = nullptr;
 				Node *root = SCENE_TREE()->get_edited_scene_root();
 				if (root) {

diff --git a/src/debug_draw_manager.cpp b/src/debug_draw_manager.cpp
@@ -242,7 +242,14 @@ void DebugDrawManager::_integrate_into_engine() {
 		if (Engine::get_singleton()->has_singleton("DisplayServer")) {
 			Object *display_server = Engine::get_singleton()->get_singleton("DisplayServer");
 			if (display_server) {
-				set_debug_enabled(display_server->call("window_can_draw", 0));
+				bool is_enabled = display_server->call("window_can_draw", 0);
+				set_debug_enabled(is_enabled);
+
+#if defined(TOOLS_ENABLED) && defined(TELEMETRY_ENABLED)
+				if (IS_EDITOR_HINT() && is_enabled) {
+					time_usage_reporter = std::make_unique<UsageTimeReporter>(DD3D_VERSION_STR, Utils::root_settings_section, [&]() { call_deferred(NAMEOF(_on_telemetry_sending_completed)); });
+				}
+#endif
 			}
 		} else {
 			set_debug_enabled(false);
@@ -348,12 +355,6 @@ void DebugDrawManager::_integrate_into_engine() {
 #ifdef TOOLS_ENABLED
 	if (IS_EDITOR_HINT()) {
 		_try_to_update_cs_bindings();
-
-#ifdef TELEMETRY_ENABLED
-		if (!is_headless) {
-			time_usage_reporter = std::make_unique<UsageTimeReporter>(DD3D_VERSION_STR, [&]() { call_deferred(NAMEOF(_on_telemetry_sending_completed)); });
-		}
-#endif
 	}
 #endif
 }