From fd657b8fc41a4b37d3d69c3076974d8041f9ae54 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sun, 20 Nov 2011 07:11:05 +0000 Subject: [PATCH] also move magic unset to after all events come back so we don't break anyone's event handlers SVN revision: 65426 --- legacy/ecore/src/lib/ecore_con/ecore_con.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c index eaa4425..0d9345a 100644 --- a/legacy/ecore/src/lib/ecore_con/ecore_con.c +++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c @@ -1165,7 +1165,6 @@ _ecore_con_server_free(Ecore_Con_Server *svr) return; } - ECORE_MAGIC_SET(svr, ECORE_MAGIC_NONE); t_start = ecore_time_get(); while (svr->buf && (!svr->dead)) { @@ -1185,6 +1184,7 @@ _ecore_con_server_free(Ecore_Con_Server *svr) ecore_con_local_win32_server_del(svr); #endif if (svr->event_count) return; + ECORE_MAGIC_SET(svr, ECORE_MAGIC_NONE); if (svr->buf) eina_binbuf_free(svr->buf); @@ -1239,7 +1239,6 @@ _ecore_con_client_free(Ecore_Con_Client *cl) } - ECORE_MAGIC_SET(cl, ECORE_MAGIC_NONE); t_start = ecore_time_get(); while ((cl->buf) && (!cl->dead)) { @@ -1260,6 +1259,7 @@ _ecore_con_client_free(Ecore_Con_Client *cl) #endif if (cl->event_count) return; + ECORE_MAGIC_SET(cl, ECORE_MAGIC_NONE); free(cl->buf); -- 2.7.4