X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/530ecef01f7e33c2ec1b8b1ad8025484709bef1d..74a8f67d96591cec101def2a7d47c64072aff7fd:/src/common/sckstrm.cpp?ds=sidebyside

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 5b1fcac0ca..f060b3fd1f 100644
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -41,10 +41,11 @@ wxSocketOutputStream::~wxSocketOutputStream()
 
 size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
 {
-    size_t ret = m_o_socket->Write((const char *)buffer, size).LastCount();
-
-    m_lasterror = m_o_socket->Error() ? wxSTREAM_WRITE_ERROR : wxSTREAM_NO_ERROR;
-
+    const size_t ret = m_o_socket->Write(buffer, size).LastCount();
+    m_lasterror = m_o_socket->Error()
+                    ? m_o_socket->IsClosed() ? wxSTREAM_EOF
+                                             : wxSTREAM_WRITE_ERROR
+                    : wxSTREAM_NO_ERROR;
     return ret;
 }
 
@@ -63,10 +64,11 @@ wxSocketInputStream::~wxSocketInputStream()
 
 size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
 {
-    size_t ret = m_i_socket->Read((char *)buffer, size).LastCount();
-
-    m_lasterror = m_i_socket->Error() ? wxSTREAM_READ_ERROR : wxSTREAM_NO_ERROR;
-
+    const size_t ret = m_i_socket->Read(buffer, size).LastCount();
+    m_lasterror = m_i_socket->Error()
+                    ? m_i_socket->IsClosed() ? wxSTREAM_EOF
+                                             : wxSTREAM_READ_ERROR
+                    : wxSTREAM_NO_ERROR;
     return ret;
 }
 
@@ -83,5 +85,4 @@ wxSocketStream::~wxSocketStream()
 {
 }
 
-#endif
-  // wxUSE_STREAMS && wxUSE_SOCKETS
+#endif // wxUSE_STREAMS && wxUSE_SOCKETS