devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=1d876e8fbaafe7bf0469597f52b319fe919ac6b4

commit 1d876e8fbaafe7bf0469597f52b319fe919ac6b4
Author: Chris Michael <cpmich...@osg.samsung.com>
Date:   Fri Dec 4 10:47:44 2015 -0500

    elementary: Don't call ecore_wl2_shutdown unless we have a display
    
    During _elm_config_sub_shutdown we were explicitly calling
    ecore_wl2_shutdown. We should only be doing this if we are actually in
    a wayland environment.
    
    @fix
    
    Signed-off-by: Chris Michael <cpmich...@osg.samsung.com>
---
 src/lib/elm_config.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 5b1fa2f..22b4909 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -3327,8 +3327,11 @@ _elm_config_sub_shutdown(void)
    if (ecore_x_display_get()) ecore_x_shutdown();
 #endif
 #ifdef HAVE_ELEMENTARY_WL2
-   if (_elm_wl_display) ecore_wl2_display_disconnect(_elm_wl_display);
-   ecore_wl2_shutdown();
+   if (_elm_wl_display)
+     {
+        ecore_wl2_display_disconnect(_elm_wl_display);
+        ecore_wl2_shutdown();
+     }
 #endif
 #ifdef HAVE_ELEMENTARY_WIN32
    ecore_win32_shutdown();

-- 


Reply via email to