godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Apply prefer_wayland only if no display driver is set

Browse Source 
Before this patch any other display driver preference would be
overridden.
This commit is contained in:
Riteo
2024-07-26 07:29:34 +02:00
parent e343dbbcc1
commit 755dbde873
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/main.cpp
View File

@@ -2631,6 +2631,7 @@ Error Main::setup2(bool p_show_boot_logo) {
} }
} }
if (display_driver.is_empty()) {
if (prefer_wayland) { if (prefer_wayland) {
display_driver = "wayland"; display_driver = "wayland";
} else { } else {
@@ -2639,6 +2640,7 @@ Error Main::setup2(bool p_show_boot_logo) {
} }
} }
} }
}
if (found_project && EditorPaths::get_singleton()->is_self_contained()) { 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()) { if (ProjectSettings::get_singleton()->get_resource_path() == OS::get_singleton()->get_executable_path().get_base_dir()) {