jyapayne/moonlight-qt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix EGLFS detection when a compositor is running on wayland-0 in another VT

Browse source
This commit is contained in:
Cameron Gutman 2025-12-30 00:04:55 -06:00
commit f3f1d56e8d
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/wm.cpp
View file

@ -145,10 +145,21 @@ bool WMUtils::isRunningWayland()
// If the value is not set yet, populate it now.
int val = SDL_AtomicGet(&isRunningOnWayland);
if (!(val & VALUE_SET)) {
struct wl_display* display = wl_display_connect(nullptr);
struct wl_display* display = nullptr;
// We need to avoid the default fallback to wayland-0 that wl_display_connect()
// will try for cases where we might be running from a TTY with a Wayland
// compositor running in another VT that happens to use the wayland-0 name.
if (!qEnvironmentVariableIsEmpty("WAYLAND_DISPLAY") ||
!qEnvironmentVariableIsEmpty("WAYLAND_SOCKET") ||
qgetenv("XDG_SESSION_TYPE") == "wayland") {
// This looks like it might be a Wayland environment, so give it a shot
display = wl_display_connect(nullptr);
if (display != nullptr) {
wl_display_disconnect(display);
}
}
// Populate the value to return and have for next time.
// This can race with another thread populating the same data,