summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cp.michael@samsung.com>2017-03-01 12:08:09 -0500
committerChris Michael <cp.michael@samsung.com>2017-03-01 12:08:09 -0500
commit5ec4715b9d8f8b95f5d75aaa4a948de4641299eb (patch)
tree84b9e4c1b0d55d0fe82162b5147f5ef641d6d1fa
parent81783ec75caf4e4314abd8baf362718379b86570 (diff)
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.michael@samsung.com>
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_display.c5
1 files 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 232bbfdc54..689e1e8d3f 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)
811 if (display->refs == 0) 811 if (display->refs == 0)
812 { 812 {
813 wl_display_roundtrip(display->wl.display); 813 wl_display_roundtrip(display->wl.display);
814
815 _ecore_wl2_display_cleanup(display);
816
814 wl_display_disconnect(display->wl.display); 817 wl_display_disconnect(display->wl.display);
815 818
816 /* remove this client display from hash */ 819 /* remove this client display from hash */
817 eina_hash_del_by_key(_client_displays, display->name); 820 eina_hash_del_by_key(_client_displays, display->name);
818 821
819 _ecore_wl2_display_cleanup(display);
820
821 free(display->name); 822 free(display->name);
822 free(display); 823 free(display);
823 } 824 }