devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5ec4715b9d8f8b95f5d75aaa4a948de4641299eb
commit 5ec4715b9d8f8b95f5d75aaa4a948de4641299eb
Author: Chris Michael <cp.mich...@samsung.com>
Date: Wed Mar 1 12:08:09 2017 -0500
ecore-wl2: Fix efl apps crashing on close in wayland
Commit c6b59be1da ensured display cleanup after roundtrips, however we
cannot call the display_cleanup function After the display has been
disconnected ... oopsie. Essentially the call to the cleanup function
was in the wrong place here so fix.
Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
src/lib/ecore_wl2/ecore_wl2_display.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c
b/src/lib/ecore_wl2/ecore_wl2_display.c
index 232bbfd..689e1e8 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -811,13 +811,14 @@ ecore_wl2_display_disconnect(Ecore_Wl2_Display *display)
if (display->refs == 0)
{
wl_display_roundtrip(display->wl.display);
+
+ _ecore_wl2_display_cleanup(display);
+
wl_display_disconnect(display->wl.display);
/* remove this client display from hash */
eina_hash_del_by_key(_client_displays, display->name);
- _ecore_wl2_display_cleanup(display);
-
free(display->name);
free(display);
}
--
