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
commit 39377c2d30
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 4 deletions

View File

@ -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";
}
}
}
}