Ensure that DISPLAY vars are non-empty before using

It's common to disable Wayland by `WAYLAND_DISPLAY= <application>`.
kchibisov · Oct 21, 2023 · 7a23c5c · 7a23c5c
1 parent 837dac9
commit 7a23c5c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/platform_impl/linux/mod.rs b/src/platform_impl/linux/mod.rs
@@ -752,11 +752,16 @@ impl<T: 'static> EventLoop<T> {
             );
         }
 
-        // NOTE: Wayland first because of X11 could be present under wayland as well.
+        // NOTE: Wayland first because of X11 could be present under Wayland as well. Empty
+        // variables are also treated as not set.
         let backend = match (
             attributes.forced_backend,
-            env::var("WAYLAND_DISPLAY").is_ok(),
-            env::var("DISPLAY").is_ok(),
+            env::var("WAYLAND_DISPLAY")
+                .map(|var| !var.is_empty())
+                .unwrap_or(false),
+            env::var("DISPLAY")
+                .map(|var| !var.is_empty())
+                .unwrap_or(false),
         ) {
             // User is forcing a backend.
             (Some(backend), _, _) => backend,