summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2015-12-07 09:25:49 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2016-02-02 13:32:30 -0500
commitbe2221ed9542ac54bc27bee90a3d0ed051c2aca7 (patch)
tree84ba3741fa8166df69dd1ed1c600f82c0929e5fe
parent8cc52073558fccf18d25a9f70e3f78e9dd4f5559 (diff)
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.michael@samsung.com>
-rw-r--r--src/bin/e_comp_wl.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index de5eb6e4e..4fee9dc15 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2735,6 +2735,13 @@ _e_comp_wl_gl_init(void *d EINA_UNUSED)
2735E_API Eina_Bool 2735E_API Eina_Bool
2736e_comp_wl_init(void) 2736e_comp_wl_init(void)
2737{ 2737{
2738 /* try to init ecore_wayland */
2739 if (!ecore_wl2_init())
2740 {
2741 e_error_message_show(_("Enlightenment cannot initialize Ecore_Wl2!\n"));
2742 return EINA_FALSE;
2743 }
2744
2738 /* set gl available if we have ecore_evas support */ 2745 /* set gl available if we have ecore_evas support */
2739 if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL) || 2746 if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL) ||
2740 ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM)) 2747 ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM))
@@ -2747,13 +2754,6 @@ e_comp_wl_init(void)
2747 return EINA_FALSE; 2754 return EINA_FALSE;
2748 } 2755 }
2749 2756
2750 /* try to init ecore_wayland */
2751 if (!ecore_wl2_init())
2752 {
2753 e_error_message_show(_("Enlightenment cannot initialize Ecore_Wl2!\n"));
2754 return EINA_FALSE;
2755 }
2756
2757 /* create hash to store clients */ 2757 /* create hash to store clients */
2758 /* clients_win_hash = eina_hash_int64_new(NULL); */ 2758 /* clients_win_hash = eina_hash_int64_new(NULL); */
2759 2759