From 984be789d5935bc7f695dc61234ef0251ed33679 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Wed, 11 May 2016 09:15:19 +0200 Subject: [PATCH] xwayland: don't check events as early as InitInput If data is received during XWayland startup, it will be 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 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95337 Reviewed-by: Adam Jackson --- 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 f9e325516..cbc1bf2da 100644 --- a/hw/xwayland/xwayland-input.c +++ b/hw/xwayland/xwayland-input.c @@ -899,11 +899,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