summaryrefslogtreecommitdiff
path: root/legacy/ecore
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2010-12-09 06:43:58 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2010-12-09 06:43:58 +0000
commit4440764c784fcb84f9849ce97243b720477f7ea8 (patch)
treecff7b7a3f2528c974961f9dd589d52717b73d6cf /legacy/ecore
parent3b86fed32ffcdbd55bd028dcba5b0e5a0513f983 (diff)
reorder a little, fix bug where client_del event was never sent if it had send data in its buffer
question to think on: should a deleted client be allowed to finish sending its data or should it be killed immediately? SVN revision: 55391
Diffstat (limited to 'legacy/ecore')
-rw-r--r--legacy/ecore/src/lib/ecore_con/ecore_con.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con.c b/legacy/ecore/src/lib/ecore_con/ecore_con.c
index 0a5d47a9e2..3b7f81bfa6 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con.c
@@ -1209,7 +1209,10 @@ _ecore_con_client_free(Ecore_Con_Client *cl)
1209{ 1209{
1210 double t_start, t; 1210 double t_start, t;
1211 1211
1212 if ((!cl->buf) && cl->delete_me && (!cl->dead) && (cl->event_count < 1)) 1212 if (cl->event_count > 0)
1213 return;
1214
1215 if (cl->delete_me && (!cl->dead) && (cl->event_count < 1))
1213 { 1216 {
1214 /* this is a catch-all for cases when a client is not properly killed. */ 1217 /* this is a catch-all for cases when a client is not properly killed. */
1215 1218
@@ -1228,8 +1231,7 @@ _ecore_con_client_free(Ecore_Con_Client *cl)
1228 return; 1231 return;
1229 } 1232 }
1230 1233
1231 if (cl->event_count > 0) 1234
1232 return;
1233 ECORE_MAGIC_SET(cl, ECORE_MAGIC_NONE); 1235 ECORE_MAGIC_SET(cl, ECORE_MAGIC_NONE);
1234 t_start = ecore_time_get(); 1236 t_start = ecore_time_get();
1235 while ((cl->buf) && (!cl->dead)) 1237 while ((cl->buf) && (!cl->dead))