kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ecore: force close during invalidate of Efl.Io.Buffered_Stream. 

Differential Revision: https://phab.enlightenment.org/D6074
This commit is contained in:
Cedric BAIL 2018-05-01 13:30:44 -07:00
parent 0ac6e47697
commit 266dabc096
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/ecore/efl_io_buffered_stream.c
View File

@ -16,6 +16,7 @@ typedef struct
Eo *outgoing;
Eo *sender;
Eo *receiver;
Eina_Bool is_closing;
Eina_Bool closed;
Eina_Bool eos;
Eina_Bool can_read;
@ -151,6 +152,9 @@ _efl_io_buffered_stream_efl_object_finalize(Eo *o, Efl_Io_Buffered_Stream_Data *
EOLIAN static void
_efl_io_buffered_stream_efl_object_invalidate(Eo *o, Efl_Io_Buffered_Stream_Data *pd)
{
if (!efl_io_closer_closed_get(o))
efl_io_closer_close(o);
if (pd->inner_io)
{
efl_event_callback_array_del(pd->inner_io, _efl_io_buffered_stream_inner_io_cbs(), o);
@ -168,7 +172,6 @@ _efl_io_buffered_stream_efl_object_invalidate(Eo *o, Efl_Io_Buffered_Stream_Data
if (!pd->is_finished)
{
fprintf(stderr, "forced finish\n");
pd->is_finished = EINA_TRUE;
efl_event_callback_call(o, EFL_IO_BUFFERED_STREAM_EVENT_FINISHED, NULL);
}
@ -182,6 +185,8 @@ _efl_io_buffered_stream_efl_io_closer_close(Eo *o, Efl_Io_Buffered_Stream_Data *
Eina_Error err = 0;
EINA_SAFETY_ON_TRUE_RETURN_VAL(pd->closed, EINVAL);
if (pd->is_closing) return 0;
pd->is_closing = EINA_TRUE;
if (pd->outgoing)
{