From 607901fb0edf2b3ee644026b7dcbd5df1ee792c5 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Fri, 29 Aug 2014 10:07:14 +0100 Subject: [PATCH] Ecore con server: Fix destructor to call super correctly. --- src/lib/ecore_con/ecore_con.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c index b915897..ace1ef4 100644 --- a/src/lib/ecore_con/ecore_con.c +++ b/src/lib/ecore_con/ecore_con.c @@ -1283,7 +1283,7 @@ _ecore_con_server_eo_base_destructor(Eo *obj, Ecore_Con_Server_Data *svr) Ecore_Con_Client *cl_obj; double t_start, t; - if (svr->event_count) return; + if (svr->event_count) goto end; while (svr->infos) { @@ -1309,7 +1309,7 @@ _ecore_con_server_eo_base_destructor(Eo *obj, Ecore_Con_Server_Data *svr) #ifdef _WIN32 ecore_con_local_win32_server_del(obj); #endif - if (svr->event_count) return; + if (svr->event_count) goto end; if (svr->buf) eina_binbuf_free(svr->buf); @@ -1352,6 +1352,7 @@ _ecore_con_server_eo_base_destructor(Eo *obj, Ecore_Con_Server_Data *svr) servers = eina_list_remove(servers, obj); svr->data = NULL; +end: eo_do_super(obj, ECORE_CON_SERVER_CLASS, eo_destructor()); } -- 2.7.4