summaryrefslogtreecommitdiff
path: root/hw/xwayland/xwayland.c
diff options
context:
space:
mode:
authorMarek Chalupa <mchqwerty@gmail.com>2015-11-27 14:27:46 +0100
committerAdam Jackson <ajax@redhat.com>2015-11-30 11:56:28 -0500
commit5b2ca3413203210d112a08a4e20d14382abae437 (patch)
tree505d75dadaa0886dc600080e66bef22a591213f0 /hw/xwayland/xwayland.c
parent646ebea456b4c5251ae997eab8d9b971f97de836 (diff)
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 <mchqwerty@gmail.com> Reviewed-by: Olivier Fourdan <ofourdan@redhat.com>
Diffstat (limited to 'hw/xwayland/xwayland.c')
-rw-r--r--hw/xwayland/xwayland.c4
1 files changed, 2 insertions, 2 deletions
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 &&