X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1632883f9ae83cb0f75b82432ab1f8ca7cfae451..7198c3368055d88249a338eb33b21f051f674806:/src/common/socket.cpp?ds=sidebyside

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index c0c35df4e2..64803df7a4 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -980,7 +980,11 @@ wxUint32 wxSocketBase::DoRead(void* buffer_, wxUint32 nbytes)
             {
                 // if we don't want to wait, just return immediately
                 if ( m_flags & wxSOCKET_NOWAIT )
+                {
+                    // this shouldn't be counted as an error in this case
+                    SetError(wxSOCKET_NOERROR);
                     break;
+                }
 
                 // otherwise wait until the socket becomes ready for reading or
                 // an error occurs on it