2 files changed, 7 insertions, 0 deletions

diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c
index e99b4a90bd..684c25da58 100644
--- a/src/lib/ecore_con/ecore_con_legacy.c
+++ b/src/lib/ecore_con/ecore_con_legacy.c
@@ -2262,6 +2262,10 @@ ecore_con_server_flush(Ecore_Con_Server *svr)
 
    if (!svr->dialer) return;
 
+   while (!efl_io_closer_closed_get(svr->dialer) &&
+          !efl_net_dialer_connected_get(svr->dialer))
+     ecore_main_loop_iterate();
+
    efl_io_buffered_stream_flush(svr->dialer, EINA_FALSE, EINA_TRUE);
 
    inner_dialer = efl_io_buffered_stream_inner_io_get(svr->dialer);
diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c
index 40a1e1e8a7..ec83de76f5 100644
--- a/src/lib/ecore_ipc/ecore_ipc.c
+++ b/src/lib/ecore_ipc/ecore_ipc.c
@@ -1182,6 +1182,9 @@ ecore_ipc_server_flush(Ecore_Ipc_Server *svr)
      }
    if (svr->dialer.input)
      {
+        while (!efl_io_closer_closed_get(svr->dialer.dialer) &&
+               !efl_net_dialer_connected_get(svr->dialer.dialer))
+          ecore_main_loop_iterate();
         while (efl_io_queue_usage_get(svr->dialer.input) > 0)
           efl_io_copier_flush(svr->dialer.send_copier, EINA_TRUE, EINA_TRUE);
         return;