elementary: Don't call ecore_wl2_shutdown unless we have a display
authorChris Michael <cpmichael@osg.samsung.com>
Fri, 4 Dec 2015 15:47:44 +0000 (10:47 -0500)
committerChris Michael <cpmichael@osg.samsung.com>
Fri, 4 Dec 2015 15:48:45 +0000 (10:48 -0500)
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 <cpmichael@osg.samsung.com>
legacy/elementary/src/lib/elm_config.c

index 5b1fa2f..22b4909 100644 (file)
@@ -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();