From fc17c74516c7c843f15426bca754a16f963ad348 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Wed, 22 Nov 2017 08:23:23 -0500 Subject: xwayland: clean up seat setting --- xwayland/xwayland.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'xwayland') diff --git a/xwayland/xwayland.c b/xwayland/xwayland.c index bd43fefb..4db30985 100644 --- a/xwayland/xwayland.c +++ b/xwayland/xwayland.c @@ -196,6 +196,10 @@ static int xserver_handle_ready(int signal_number, void *data) { return 1; } + if (wlr_xwayland->seat) { + xwm_set_seat(wlr_xwayland->xwm, wlr_xwayland->seat); + } + wl_event_source_remove(wlr_xwayland->sigusr1_source); wlr_xwayland->sigusr1_source = NULL; @@ -344,5 +348,9 @@ void wlr_xwayland_set_cursor(struct wlr_xwayland *wlr_xwayland, void wlr_xwayland_set_seat(struct wlr_xwayland *xwayland, struct wlr_seat *seat) { - xwm_set_seat(xwayland->xwm, seat); + xwayland->seat = seat; + + if (xwayland->xwm) { + xwm_set_seat(xwayland->xwm, seat); + } } -- cgit v1.2.3