mirror of
https://github.com/godotengine/godot.git
synced 2024-12-27 11:24:59 +08:00
Merge pull request #94774 from Riteo/thats-probably-my-biggest-oopsie-yet
Apply `prefer_wayland` only if no display driver is set
This commit is contained in:
commit
39377c2d30
@ -2631,10 +2631,12 @@ Error Main::setup2(bool p_show_boot_logo) {
|
||||
}
|
||||
}
|
||||
|
||||
if (prefer_wayland) {
|
||||
display_driver = "wayland";
|
||||
} else {
|
||||
display_driver = "default";
|
||||
if (display_driver.is_empty()) {
|
||||
if (prefer_wayland) {
|
||||
display_driver = "wayland";
|
||||
} else {
|
||||
display_driver = "default";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user