devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=36b6a402c663fd6b6841e4ed2fc61968d4192153

commit 36b6a402c663fd6b6841e4ed2fc61968d4192153
Author: Chris Michael <cp.mich...@samsung.com>
Date:   Mon Dec 7 09:25:49 2015 -0500

    Try to init (and error check the init) of ecore_wl2 library before we
    create a compositor
    
    ref T2919
    
    Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
 src/bin/e_comp_wl.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index b44918c..068d8d6 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2459,8 +2459,6 @@ _e_comp_wl_compositor_create(void)
        return EINA_FALSE;
      }
 
-   ecore_wl2_init();
-
    /* set compositor wayland data */
    e_comp_wl = e_comp->wl_comp_data = cdata;
 
@@ -2662,6 +2660,13 @@ _e_comp_wl_gl_init(void *d EINA_UNUSED)
 E_API Eina_Bool
 e_comp_wl_init(void)
 {
+   /* try to init ecore_wayland */
+   if (!ecore_wl2_init())
+     {
+        e_error_message_show(_("Enlightenment cannot initialize 
Ecore_Wl2!\n"));
+        return EINA_FALSE;
+     }
+
    /* set gl available if we have ecore_evas support */
    if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL) ||
        ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM))
@@ -2674,13 +2679,6 @@ e_comp_wl_init(void)
         return EINA_FALSE;
      }
 
-   /* try to init ecore_wayland */
-   if (!ecore_wl2_init())
-     {
-        e_error_message_show(_("Enlightenment cannot initialize 
Ecore_Wl2!\n"));
-        return EINA_FALSE;
-     }
-
    /* create hash to store clients */
    /* clients_win_hash = eina_hash_int64_new(NULL); */
 

-- 


Reply via email to