From 2851d3fa36ce58948da93d807f826aee60d4dfea Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Wed, 11 May 2016 08:51:01 +0200 Subject: [PATCH xserver] xwayland: don't check events as early as InitInput If data is received during XWayland startup, it will be received and read early in InitInput() before the connection data is initialized, causing a crash. Remove the wayland rountrips from InitInput() as this is done again in xwl_screen_init() where it seems more appropriate. Signed-off-by: Olivier Fourdan --- hw/xwayland/xwayland-input.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c index 23e138d..cf90675 100644 --- a/hw/xwayland/xwayland-input.c +++ b/hw/xwayland/xwayland-input.c @@ -895,11 +895,6 @@ InitInput(int argc, char *argv[]) xwl_screen->input_registry = wl_display_get_registry(xwl_screen->display); wl_registry_add_listener(xwl_screen->input_registry, &input_listener, xwl_screen); - - xwl_screen->expecting_event = 0; - wl_display_roundtrip(xwl_screen->display); - while (xwl_screen->expecting_event) - wl_display_roundtrip(xwl_screen->display); } void -- 2.7.4