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

akien-mga · akien-mga · commit 39377c2d3067 · 2024-07-26T13:44:19.000+02:00
Apply `prefer_wayland` only if no display driver is set
diff --git a/main/main.cpp b/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";
+						}
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -2631,10 +2631,12 @@ Error Main::setup2(bool p_show_boot_logo) {`
`2631`	`2631`	`}`
`2632`	`2632`	`}`
`2633`	`2633`
`2634`		`- if (prefer_wayland) {`
`2635`		`- display_driver = "wayland";`
`2636`		`- } else {`
`2637`		`- display_driver = "default";`
	`2634`	`+ if (display_driver.is_empty()) {`
	`2635`	`+ if (prefer_wayland) {`
	`2636`	`+ display_driver = "wayland";`
	`2637`	`+ } else {`
	`2638`	`+ display_driver = "default";`
	`2639`	`+ }`
`2638`	`2640`	`}`
`2639`	`2641`	`}`
`2640`	`2642`	`}`