Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply prefer_wayland only if no display driver is set #94774

Merged

Conversation

Riteo
Copy link
Contributor

@Riteo Riteo commented Jul 26, 2024

Fixes #94755.

Before this patch any other display driver preference would be overridden.


Regarding the display_driver = "default" line, it's there so that if the project uses Wayland and prefer_wayland is set to false the editor actually tries X11 first like I think the user would expect and the documentation implies.

I think that this option should probably be improved in the first place but we're on a release candidate :gdsweat:

Before this patch any other display driver preference would be
overridden.
@mihe
Copy link
Contributor

mihe commented Jul 26, 2024

I can confirm that this resolves the issue on Windows at least, when doing --headless --import.

@akien-mga akien-mga changed the title Apply prefer_wayland only if no display driver is set Apply prefer_wayland only if no display driver is set Jul 26, 2024
Copy link
Member

@akien-mga akien-mga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code is really hacky, we'll need to refactor this and do it more properly in the future.

But for now this seems fine to solve the regression.

@akien-mga akien-mga merged commit 39377c2 into godotengine:master Jul 26, 2024
18 checks passed
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

--headless doesn't have any effect
3 participants