You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-05 12:10: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:
@@ -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()) {
|
||||
|
||||
Reference in New Issue
Block a user