tinqs/engine
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix startup errors/warnings on X11 when the Prefer Wayland editor setting is enabled

Browse Source 
This makes the editor setting act as if it's ignored when not
currently on a Wayland session.

(cherry picked from commit 8462c586bf65ef8e4629d859ff9b332ee5946253)
This commit is contained in:
Hugo Locurcio
2026-02-16 19:25:20 +01:00
committed by Thaddeus Crews
parent 4d176d8b81
commit d96d41395e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/main.cpp
+5
View File
@@ -3043,7 +3043,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") {
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;