better fix for warning around custom cursor shape

dykwia-labs · Apr 26, 2024 · aa3f5ca · aa3f5ca
1 parent 6208859
commit aa3f5ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
@@ -6888,7 +6888,9 @@ EditorNode::EditorNode() {
 			// Only if no touchscreen ui hint, disable emulation just in case.
 			Input::get_singleton()->set_emulate_touch_from_mouse(false);
 		}
-		DisplayServer::get_singleton()->cursor_set_custom_image(Ref<Resource>());
+		if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_CUSTOM_CURSOR_SHAPE)) {
+			DisplayServer::get_singleton()->cursor_set_custom_image(Ref<Resource>());
+		}
 	}
 
 	SceneState::set_disable_placeholders(true);

diff --git a/servers/display_server.cpp b/servers/display_server.cpp
@@ -502,9 +502,7 @@ DisplayServer::CursorShape DisplayServer::cursor_get_shape() const {
 }
 
 void DisplayServer::cursor_set_custom_image(const Ref<Resource> &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
-	if (p_cursor.is_valid() || p_shape != CURSOR_ARROW || !p_hotspot.is_zero_approx()) {
-		WARN_PRINT("Custom cursor shape not supported by this display server.");
-	}
+	WARN_PRINT("Custom cursor shape not supported by this display server.");
 }
 
 bool DisplayServer::get_swap_cancel_ok() {