X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..77a1771911ed222ba6861ead327c3735fc16a0b1:/src/common/socket.cpp?ds=sidebyside

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index 3f7554ef2e..080518cd0e 100644
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -31,11 +31,11 @@
     #include "wx/log.h"
     #include "wx/event.h"
     #include "wx/app.h"
+    #include "wx/utils.h"
 #endif
 
 #include "wx/apptrait.h"
 #include "wx/timer.h"
-#include "wx/utils.h"
 #include "wx/module.h"
 
 #include "wx/sckaddr.h"
@@ -330,11 +330,9 @@ wxUint32 wxSocketBase::_Read(void* buffer, wxUint32 nbytes)
 
   // Return now in one of the following cases:
   // - the socket is invalid,
-  // - we got all the data,
-  // - we got *some* data and we are not using wxSOCKET_WAITALL.
+  // - we got all the data
   if ( !m_socket ||
-       !nbytes ||
-       ((total != 0) && !(m_flags & wxSOCKET_WAITALL)) )
+       !nbytes )
     return total;
 
   // Possible combinations (they are checked in this order)