X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/74a50e49237c9cb484d32223fd65ef3f8666309a..f239a20092359e3c914adb79bd39f3f5d2b2e06f:/src/common/sckstrm.cpp

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index cb3d65b13b..f060b3fd1f 100644
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -41,8 +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;
 }
 
@@ -61,8 +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;
 }