summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-03-04 13:34:09 +0100
committerRémi Verschelde <rverschelde@gmail.com>2024-03-04 13:34:09 +0100
commit2d4c92330713ff386cf395409e5bcefa96bbfa0e (patch)
treea7293a72a41953fdf96a4e310297d82f609194d4
parentdd2a611118070f134da0b731f2fe9a8683902b8a (diff)
parente6d0bf32e9cfca1118d95a371d869c8ec0d43d2b (diff)
downloadredot-engine-2d4c92330713ff386cf395409e5bcefa96bbfa0e.tar.gz
Merge pull request #89099 from chrisl8/no_custom_cursor_error_in_headless
Do not attempt to set cursor shape in headless mode.
-rw-r--r--editor/editor_node.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index dc90256490..d2d10efaf3 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -6191,7 +6191,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);