Skip to content

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

Merged
Repiteo merged 1 commit into
godotengine:masterfrom
Calinou:editor-prefer-wayland-avoid-error-on-x11
Feb 16, 2026
Merged

Fix startup errors/warnings on X11 when the Prefer Wayland editor setting is enabled#116366
Repiteo merged 1 commit into
godotengine:masterfrom
Calinou:editor-prefer-wayland-avoid-error-on-x11

Conversation

@Calinou

@Calinou Calinou commented Feb 16, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

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

Previously, this was printed on every editor launch when the setting is enabled:

ERROR: Parameter "display" is null.
   at: init (platform/linuxbsd/wayland/wayland_embedder.cpp:2819)
ERROR: Can't initialize Wayland embedder.
   at: init (platform/linuxbsd/wayland/wayland_thread.cpp:4799)
ERROR: Could not initialize the Wayland thread.
   at: DisplayServerWayland (platform/linuxbsd/wayland/display_server_wayland.cpp:2032)
ERROR: Can't create the Wayland display server.
   at: create_func (platform/linuxbsd/wayland/display_server_wayland.cpp:2002)
WARNING: Display driver wayland failed, falling back to x11.
     at: setup2 (main/main.cpp:3251)

Tested on KDE with X11 and Wayland sessions (Wayland is still used correctly on the Wayland session).
@Calinou
Fix startup errors/warnings on X11 when the Prefer Wayland editor set…
8462c58 
…ting is enabled

This makes the editor setting act as if it's ignored when not
currently on a Wayland session.
@Calinou Calinou requested a review from a team as a code owner February 16, 2026 18:26
@Calinou Calinou added bug platform:linuxbsd topic:platforms cherrypick:4.6 Considered for cherry-picking into a future 4.6.x release labels Feb 16, 2026
@Calinou Calinou added this to the 4.7 milestone Feb 16, 2026
@Ivorforce Ivorforce requested a review from a team February 16, 2026 18:35
@Repiteo Repiteo merged commit 5866e4f into godotengine:master Feb 16, 2026
20 checks passed
@Repiteo

Repiteo commented Feb 16, 2026

Copy link
Copy Markdown
Contributor

Thanks!
@Repiteo

Repiteo commented Feb 20, 2026

Copy link
Copy Markdown
Contributor

Cherry-picked for 4.6.2.
@Repiteo Repiteo removed the cherrypick:4.6 Considered for cherry-picking into a future 4.6.x release label Feb 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment