From 54672a9f6b3f18124edfec3591c6413d0196e25e Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sun, 10 May 2026 17:21:05 -0400 Subject: [PATCH] fix: do not use xdisplay to read locale on wayland fixes: #9717 --- src/lib/deskflow/unix/AppUtilUnix.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/lib/deskflow/unix/AppUtilUnix.cpp b/src/lib/deskflow/unix/AppUtilUnix.cpp index 0f1c3cc09..d426e042b 100644 --- a/src/lib/deskflow/unix/AppUtilUnix.cpp +++ b/src/lib/deskflow/unix/AppUtilUnix.cpp @@ -8,6 +8,7 @@ #include "deskflow/unix/AppUtilUnix.h" #include "base/Log.h" +#include "common/PlatformInfo.h" #if WINAPI_XWINDOWS #include "deskflow/unix/X11LayoutsParser.h" @@ -91,9 +92,13 @@ std::vector AppUtilUnix::getKeyboardLayoutList() return layoutLangCodes; } +// TODO: read the layout for x and wayland via xkbcommon std::string AppUtilUnix::getCurrentLanguageCode() { std::string result = ""; + if (deskflow::platform::isWayland()) + return result; + #if WINAPI_XWINDOWS auto display = XOpenDisplay(nullptr);