Quellcode durchsuchen

Merge pull request #94774 from Riteo/thats-probably-my-biggest-oopsie-yet

Apply `prefer_wayland` only if no display driver is set
Rémi Verschelde vor 1 Jahr
Ursprung
Commit
39377c2d30
1 geänderte Dateien mit 6 neuen und 4 gelöschten Zeilen
  1. 6 4
      main/main.cpp

+ 6 - 4
main/main.cpp

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