From 5b2ca3413203210d112a08a4e20d14382abae437 Mon Sep 17 00:00:00 2001 From: Marek Chalupa Date: Fri, 27 Nov 2015 14:27:46 +0100 Subject: xwayland: check if creating xwl_output succeeded check return values of RR.*Create calls v2. do not bail out if we don't have any output Signed-off-by: Marek Chalupa Reviewed-by: Olivier Fourdan --- hw/xwayland/xwayland.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'hw/xwayland/xwayland.c') diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c index 1ce586801..55bf6d069 100644 --- a/hw/xwayland/xwayland.c +++ b/hw/xwayland/xwayland.c @@ -421,8 +421,8 @@ registry_global(void *data, struct wl_registry *registry, uint32_t id, wl_registry_bind(registry, id, &wl_shell_interface, 1); } else if (strcmp(interface, "wl_output") == 0 && version >= 2) { - xwl_output_create(xwl_screen, id); - xwl_screen->expecting_event++; + if (xwl_output_create(xwl_screen, id)) + xwl_screen->expecting_event++; } #ifdef GLAMOR_HAS_GBM else if (xwl_screen->glamor && -- cgit v1.2.3