diff options
| author | Derek Foreman <derekf@osg.samsung.com> | 2016-11-09 16:33:49 -0600 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2016-11-09 16:33:49 -0600 |
| commit | 9ad35a6fa213a420f532a4fc65059f7f24060135 (patch) | |
| tree | ddca5ed104dda67d2bb055231e8491648b05eecb | |
| parent | 21617f83c2f4a3ce29712930cd482e461369953c (diff) | |
| download | efl-9ad35a6fa213a420f532a4fc65059f7f24060135.tar.gz | |
ecore_evas_wayland: Re-kill double disconnect bug on fallback
Jpeg caught this one a while back and it got re-introduced recently.
| -rw-r--r-- | src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |