From e442e7bc385f3ded809b76e111b402034bb36e42 Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Tue, 5 Aug 2014 16:09:03 +0200 Subject: ilmControl: check roundtrip results on init Signed-off-by: Marcus Fritzsch --- .../ilmControl/src/ilm_control_wayland_platform.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c index 30b06e6..73568d7 100644 --- a/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c +++ b/ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c @@ -1201,12 +1201,17 @@ init_control(void) return -1; } - // first level objects; ivi_controller - display_roundtrip_queue(wl->display, wl->queue); - // second level object: ivi_controller_surfaces/layers - display_roundtrip_queue(wl->display, wl->queue); - // third level objects: ivi_controller_surfaces/layers properties - display_roundtrip_queue(wl->display, wl->queue); + if ( + // first level objects; ivi_controller + display_roundtrip_queue(wl->display, wl->queue) == -1 || + // second level object: ivi_controller_surfaces/layers + display_roundtrip_queue(wl->display, wl->queue) == -1 || + // third level objects: ivi_controller_surfaces/layers properties + display_roundtrip_queue(wl->display, wl->queue) == -1) + { + fprintf(stderr, "Failed to initialize wayland connection: %s\n", strerror(errno)); + return -1; + } if (! wl->controller) { -- cgit v1.2.1