1 files changed, 7 insertions, 22 deletions

diff --git a/libraries/ecore/src/lib/ecore_con/ecore_con_local_win32.c b/libraries/ecore/src/lib/ecore_con/ecore_con_local_win32.c
index 858daa5..2b7e5c5 100644
--- a/libraries/ecore/src/lib/ecore_con/ecore_con_local_win32.c
+++ b/libraries/ecore/src/lib/ecore_con/ecore_con_local_win32.c
@@ -75,9 +75,7 @@ _ecore_con_local_win32_server_read_client_handler(void *data, Ecore_Win32_Handle
             free(msg);
          }
 #endif
-       if (!cl->delete_me)
-         ecore_con_event_client_del(cl);
-       cl->dead = EINA_TRUE;
+       _ecore_con_client_kill(cl);
        return ECORE_CALLBACK_CANCEL;
     }
 
@@ -110,9 +108,7 @@ _ecore_con_local_win32_server_peek_client_handler(void *data, Ecore_Win32_Handle
         free(msg);
      }
 #endif
-   if (!cl->host_server->delete_me)
-     ecore_con_event_server_del(cl->host_server);
-   cl->host_server->dead = EINA_TRUE;
+   _ecore_con_server_kill(cl->host_server);
    return ECORE_CALLBACK_CANCEL;
 
    ecore_main_win32_handler_del(wh);
@@ -140,9 +136,7 @@ _ecore_con_local_win32_client_peek_server_handler(void *data, Ecore_Win32_Handle
         free(msg);
      }
 #endif
-   if (!svr->delete_me)
-     ecore_con_event_server_del(svr);
-   svr->dead = EINA_TRUE;
+   _ecore_con_server_kill(svr);
    return ECORE_CALLBACK_CANCEL;
 
    ecore_main_win32_handler_del(wh);
@@ -191,9 +185,7 @@ _ecore_con_local_win32_client_read_server_handler(void *data, Ecore_Win32_Handle
             free(msg);
          }
 #endif
-       if (!svr->delete_me)
-         ecore_con_event_server_del(svr);
-       svr->dead = EINA_TRUE;
+       _ecore_con_server_kill(svr);
        return ECORE_CALLBACK_CANCEL;
     }
 
@@ -296,9 +288,6 @@ _ecore_con_local_win32_client_add(void *data, Ecore_Win32_Handler *wh)
    if (!svr->pipe)
      return ECORE_CALLBACK_CANCEL;
 
-   if (svr->dead)
-     return ECORE_CALLBACK_CANCEL;
-
    if (svr->delete_me)
      return ECORE_CALLBACK_CANCEL;
 
@@ -698,16 +687,14 @@ ecore_con_local_win32_server_flush(Ecore_Con_Server *svr)
              ecore_con_event_server_error(svr, msg);
              free(msg);
           }
-        if (!svr->delete_me)
-          ecore_con_event_server_del(svr);
-        svr->dead = EINA_TRUE;
+        _ecore_con_server_kill(svr);
      }
 
    svr->write_buf_offset += written;
    if (svr->write_buf_offset >= eina_binbuf_length_get(svr->buf))
      {
         svr->write_buf_offset = 0;
-        eina_binbuf_free(svr->buf);
+        eina_binbuf_free(svr->buf);
         svr->buf = NULL;
         svr->want_write = 0;
      }
@@ -749,9 +736,7 @@ ecore_con_local_win32_client_flush(Ecore_Con_Client *cl)
              ecore_con_event_client_error(cl, msg);
              free(msg);
           }
-        if (!cl->delete_me)
-          ecore_con_event_client_del(cl);
-        cl->dead = EINA_TRUE;
+        _ecore_con_client_kill(cl);
      }
 
    cl->buf_offset += written;