mirror of
https://github.com/godotengine/godot.git
synced 2025-12-08 06:09:55 +00:00
Apply prefer_wayland only if no display driver is set
Before this patch any other display driver preference would be overridden.
This commit is contained in:
parent
e343dbbcc1
commit
755dbde873
1 changed files with 6 additions and 4 deletions
|
|
@ -2631,6 +2631,7 @@ Error Main::setup2(bool p_show_boot_logo) {
|
|||
}
|
||||
}
|
||||
|
||||
if (display_driver.is_empty()) {
|
||||
if (prefer_wayland) {
|
||||
display_driver = "wayland";
|
||||
} else {
|
||||
|
|
@ -2639,6 +2640,7 @@ Error Main::setup2(bool p_show_boot_logo) {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (found_project && EditorPaths::get_singleton()->is_self_contained()) {
|
||||
if (ProjectSettings::get_singleton()->get_resource_path() == OS::get_singleton()->get_executable_path().get_base_dir()) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue