wxMessageBox off the main thread lost result code.

[wxWidgets.git] / src / common / sckstrm.cpp

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index cb3d65b13bd87aa61dc7a5be59fde1f2318e253a..8f64727d786c836683882fd35e17dd4cc9ac4888 100644 (file)
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -4,7 +4,6 @@
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     17/07/97
-// RCS-ID:      $Id$
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -41,8 +40,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 +63,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;
 }