summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-10-31 08:21:35 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-10-31 08:21:35 +0000
commitb6b8c9dac8f1a8b2ff2ec53b81d236bfa3dcff6f (patch)
tree7c68f7ff876f027cf65cd2bc5900f428cebab5c8
parent6e3dbb2cd7edbd1bd5d3b7aba419e5d90dd0ebec (diff)
Set flags correctly when receiving a module-requested write event
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@5595 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/inspsocket.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 1e9f3eb5b..c0aed919e 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -437,18 +437,8 @@ bool InspSocket::Poll()
return true;
break;
case I_CONNECTED:
-
- if (this->WaitingForWriteEvent)
- {
- /* Trigger the write event */
- n = this->OnWriteReady();
- }
- else
- {
- /* Process the read event */
- n = this->OnDataReady();
- }
- return n;
+ /* Process the read event */
+ return this->OnDataReady();
break;
default:
break;
@@ -502,6 +492,7 @@ void InspSocket::HandleEvent(EventType et)
case EVENT_WRITE:
if (this->WaitingForWriteEvent)
{
+ this->WaitingForWriteEvent = false;
if (!this->OnWriteReady())
{
this->Instance->SE->DelFd(this);