Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #116366 from Calinou/editor-prefer-wayland-avoid-error-on-x11

Browse source 
Fix startup errors/warnings on X11 when the Prefer Wayland editor setting is enabled
This commit is contained in:
Thaddeus Crews 2026-02-16 15:02:44 -06:00
commit 5866e4f58f
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
main/main.cpp
View file

@ -3051,7 +3051,12 @@ Error Main::setup2(bool p_show_boot_logo) {
init_custom_scale = value;
init_custom_scale_found = true;
} else if (!prefer_wayland_found && assign == "run/platforms/linuxbsd/prefer_wayland") {
prefer_wayland = value;
if (!OS::get_singleton()->get_environment("WAYLAND_DISPLAY").is_empty()) {
// Do not prefer Wayland if not currently on a Wayland session.
// This avoids error messages on startup when currently on X11
// and the Prefer Wayland setting is enabled.
prefer_wayland = value;
}
prefer_wayland_found = true;
} else if (!tablet_found && assign == "interface/editor/tablet_driver") {
tablet_driver_editor = value;