ecore-wl2: Fix efl apps crashing on close in wayland
authorChris Michael <cp.michael@samsung.com>
Wed, 1 Mar 2017 17:08:09 +0000 (12:08 -0500)
committerChris Michael <cp.michael@samsung.com>
Wed, 1 Mar 2017 17:08:09 +0000 (12:08 -0500)
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>
src/lib/ecore_wl2/ecore_wl2_display.c

index 232bbfd..689e1e8 100644 (file)
@@ -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);
      }