From 9ad35a6fa213a420f532a4fc65059f7f24060135 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Wed, 9 Nov 2016 16:33:49 -0600 Subject: [PATCH] ecore_evas_wayland: Re-kill double disconnect bug on fallback Jpeg caught this one a while back and it got re-introduced recently. --- .../ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index 63fab2f50d..db60d98a23 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -2167,11 +2167,14 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, unsigned int parent, i return ee; eng_err: + /* ecore_evas_free() will call ecore_wl2_display_disconnect() + * and free(ee) */ ecore_evas_free(ee); + ee = NULL; w_err: free(ee); ee_err: - ecore_wl2_display_disconnect(ewd); + if (ee) ecore_wl2_display_disconnect(ewd); conn_err: ecore_wl2_shutdown(); return NULL;