From 2cf0ed49ce19ab72d2b00ee87aa84f2a14b0317e Mon Sep 17 00:00:00 2001 From: MinJeong Kim Date: Thu, 14 May 2015 07:54:16 -0400 Subject: [PATCH] ecore_evas_wayland: prevent duplicated shutdown of ecore_wl Summary: When the ecore_evas of wayland_egl/shm is freed with ecore_evas_free(), ecore_wl_shutdown() is called by _ecore_evas_wl_common_free(). so ecore_wl_shutdown() after ecore_evas_free() has to be skipped. @fix Reviewers: devilhorns, raster, zmike, gwanglim Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2503 --- src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 1 + src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c index 4cd115c1b2..7afdcd695c 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c @@ -275,6 +275,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent, err: ecore_evas_free(ee); + return NULL; ee_err: ecore_wl_shutdown(); diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c index ce0d3343be..fb8a308c16 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c @@ -269,6 +269,8 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, unsigned int parent, err: ecore_evas_free(ee); + return NULL; + ee_err: ecore_wl_shutdown(); return NULL;