godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Rémi Verschelde 2024-07-26 13:44:19 +02:00
parent c7f862d90d 755dbde873
commit 39377c2d30
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 4 deletions
Show Stats 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()) {