Commit bf5613f8 authored by Roman Gilg's avatar Roman Gilg

xwayland: Fix wm_fd readin with no listen_fds

Since 08843efc KWin was not able to start a Wayland session. Independently
of listen_fd_count add_client_fd must be called. Same holds for the
wm_selection_callback. Therefore just remove the condition.

Bugzilla: https://bugs.freedesktop.org/109220Signed-off-by: Roman Gilg's avatarRoman Gilg <subdiff@gmail.com>
parent 7fb6338c
......@@ -95,7 +95,7 @@ ddxUseMsg(void)
static int wm_fd = -1;
static int listen_fds[5] = { -1, -1, -1, -1, -1 };
static int listen_fd_count;
static int listen_fd_count = 0;
int
ddxProcessArgument(int argc, char *argv[], int i)
......@@ -1165,12 +1165,10 @@ InitOutput(ScreenInfo * screen_info, int argc, char **argv)
LocalAccessScopeUser();
if (listen_fd_count > 0) {
if (wm_fd >= 0) {
TimerSet(NULL, 0, 1, add_client_fd, NULL);
AddCallback(&SelectionCallback, wm_selection_callback, NULL);
} else {
listen_on_fds();
}
if (wm_fd >= 0) {
TimerSet(NULL, 0, 1, add_client_fd, NULL);
AddCallback(&SelectionCallback, wm_selection_callback, NULL);
} else if (listen_fd_count > 0) {
listen_on_fds();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment