AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Treat G_IO_HUP as read, not error, event because EOF is not exceptional.

Browse Source 
When EOF is reached on a file descriptor, call the handler OnReadWaiting()
because this is not really different from getting to the EOF while reading
data in the same function. Only call OnExceptionWaiting() for the real errors.

See #10258.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2013-07-03 00:31:26 +00:00
parent d5ab427f23
commit c36ddebf93
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gtk/evtloop.cpp
View File

@ -124,14 +124,24 @@ static gboolean wx_on_channel_event(GIOChannel *channel,
wxEventLoopSourceHandler * const
handler = static_cast<wxEventLoopSourceHandler *>(data);
if (condition & G_IO_IN || condition & G_IO_PRI)
if ( (condition & G_IO_IN) || (condition & G_IO_PRI) || (condition & G_IO_HUP) )
handler->OnReadWaiting();
if (condition & G_IO_OUT)
handler->OnWriteWaiting();
else if (condition & G_IO_ERR || condition & G_IO_NVAL)
if ( (condition & G_IO_ERR) || (condition & G_IO_NVAL) )
handler->OnExceptionWaiting();
// we never want to remove source here, so always return true
//
// The source may have been removed by the handler, so it may be
// a good idea to return FALSE when the source has already been
// removed. However, that would involve somehow informing this function
// that the source was removed, which is not trivial to implement
// and handle all cases. It has been found through testing
// that if the source was removed by the handler, that even if we
// return TRUE here, the source/callback will not get called again.
return TRUE;
}
}