devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=f485d5ffdd9f2f75741d562dc813ecc13f380f4c

commit f485d5ffdd9f2f75741d562dc813ecc13f380f4c
Author: MinJeong Kim <minjjj....@samsung.com>
Date:   Thu Apr 30 11:31:19 2015 -0400

    ecore-evas-wayland: remove duplicated shutdown of ecore_evas_wl_common
    
    Summary:
     After a creation for ecore_evas_wayland_shm or ecore_evas_wayland_egl is
    failed, _ecore_evas_wl_common_shutdown() gets called 'twice'.
    
     First shutdown is from _ecore_evas_wl_common_free() which is set as 
fn_free()
    of ecore_evas engine, and this fn_free() is called by ecore_evas_free().
     Second is from direct call inside ecore_evas_wayland_shm_new_internal()
    (or ecore_evas_wayland_egl_new_internal()).
     This duplicated shutdown causes block of first next 
_ecore_evas_wl_common_init
    because init count is not zero but -1.
    
     So second shutdown should be removed so that it makes enable fall back to
    another wayland engine correctly when one is failed to create 
ecore_evas_wayland.
    
    @fix
    
    Reviewers: gwanglim, devilhorns
    
    Reviewed By: devilhorns
    
    Subscribers: cedric
    
    Differential Revision: https://phab.enlightenment.org/D2451
---
 src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 1 -
 src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 1 -
 2 files changed, 2 deletions(-)

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 d9b579d..6962434 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
@@ -253,7 +253,6 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, 
unsigned int parent,
 
  err:
    ecore_evas_free(ee);
-   _ecore_evas_wl_common_shutdown();
 
  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 b5cfa56..697813f 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
@@ -247,7 +247,6 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, 
unsigned int parent,
 
  err:
    ecore_evas_free(ee);
-   _ecore_evas_wl_common_shutdown();
  ee_err:
    ecore_wl_shutdown();
    return NULL;

-- 


Reply via email to