ilmControl: check roundtrip results on init
authorMarcus Fritzsch <marcus.fritzsch@xse.de>
Tue, 5 Aug 2014 14:09:03 +0000 (16:09 +0200)
committerNobuhiko Tanibata <NOBUHIKO_TANIBATA@denso.co.jp>
Mon, 1 Sep 2014 06:55:44 +0000 (15:55 +0900)
Signed-off-by: Marcus Fritzsch <marcus.fritzsch@xse.de>
ivi-layermanagement-api/ilmControl/src/ilm_control_wayland_platform.c

index 30b06e6..73568d7 100644 (file)
@@ -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)
     {