From 845a29a0548e12d405ca6ba3d86d9d5e5ee19e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Mon, 2 Aug 2010 08:28:47 +0000 Subject: [PATCH] * B_SELECT_{READ|WRITE|ERROR} are no flags fields, so they cannot be or'ed. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37834 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/network/stack/net_socket.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/network/stack/net_socket.cpp b/src/add-ons/kernel/network/stack/net_socket.cpp index 1d9dc3186e..0a223dcc4b 100644 --- a/src/add-ons/kernel/network/stack/net_socket.cpp +++ b/src/add-ons/kernel/network/stack/net_socket.cpp @@ -914,15 +914,21 @@ socket_notify(net_socket* _socket, uint8 event, int32 value) case B_SELECT_ERROR: socket->error = value; - event |= B_SELECT_READ | B_SELECT_WRITE; break; } MutexLocker _(socket->lock); - if (notify && socket->select_pool != NULL) + if (notify && socket->select_pool != NULL) { notify_select_event_pool(socket->select_pool, event); + if (event == B_SELECT_ERROR) { + // always notify read/write on error + notify_select_event_pool(socket->select_pool, B_SELECT_READ); + notify_select_event_pool(socket->select_pool, B_SELECT_WRITE); + } + } + return B_OK; }