_sigh

2025-01-28 02:09:31 +02:00
parent 7823518fe4
commit acc1d371ea
2 changed files with 6 additions and 21 deletions
--- a/Source/Engine/Platform/SDL/SDLPlatform.cpp
+++ b/Source/Engine/Platform/SDL/SDLPlatform.cpp
@@ -41,7 +41,12 @@ bool SDLPlatform::Init()
    else if (CommandLine::Options.Wayland)
        SDL_SetHintWithPriority(SDL_HINT_VIDEO_DRIVER, "wayland", SDL_HINT_OVERRIDE);
    else
-        SDL_SetHintWithPriority(SDL_HINT_VIDEO_DRIVER, "wayland", SDL_HINT_DEFAULT);
+    {
+        // Override the X11 preference when running in Wayland session
+        String waylandDisplayEnv;
+        if (!GetEnvironmentVariable(String("WAYLAND_DISPLAY"), waylandDisplayEnv))
+            SDL_SetHintWithPriority(SDL_HINT_VIDEO_DRIVER, "wayland", SDL_HINT_OVERRIDE);
+    }
 #endif

 #if PLATFORM_LINUX