wip

Change-Id: Idb427c13f0a973dd933831350003e7129d5bf8c5
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 21f3aee74105f7cdc7cae6dcbfb1a6770a83a2a8..1a1ef6681348dddd0e508b8ab404e40347b9412c 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -4201,10 +4201,11 @@ _e_comp_wl_compositor_create(void)
         }
        else if (a == 0)
         {
-          ERR("Received an invalid file descriptor");
+          ERR("Received an invalid socket");
           goto sock_err;
         }
 
+       /* If unset wl_display_add_socket_auto() would fail, let's fail too. */
        runtime_dir = getenv("XDG_RUNTIME_DIR");
        if (!runtime_dir)
         {
@@ -4220,7 +4221,11 @@ _e_comp_wl_compositor_create(void)
           goto sock_err;
         }
 
-       wl_display_add_socket_fd(cdata->wl.disp, f);
+       if (wl_display_add_socket_fd(cdata->wl.disp, f) < 0)
+        {
+          ERR("Could not add a file descriptor to a display");
+          goto sock_err;
+        }
      }
    else
 #endif