ConvertToImage: Check !Ok() (we may not have any ref data at all) and if

[wxWidgets.git] / src / unix / gsocket.c

diff --git a/src/unix/gsocket.c b/src/unix/gsocket.c
index 396a93641dac7a85b999f239d6b0043c74e4be55..dc6c7e570204b4003710cab36a86d44267200401 100644 (file)
--- a/src/unix/gsocket.c
+++ b/src/unix/gsocket.c
@@ -261,7 +261,10 @@ GSocket *GSocket_new(void)
 void GSocket_close(GSocket *socket)
 {
     _GSocket_Disable_Events(socket);
 void GSocket_close(GSocket *socket)
 {
     _GSocket_Disable_Events(socket);

+// gsockosx.c calls CFSocketInvalidate which closes the socket for us
+#if !(defined(__DARWIN__) && (defined(__WXMAC__) || defined(__WXCOCOA__)))

     close(socket->m_fd);
     close(socket->m_fd);

+#endif

     socket->m_fd = INVALID_SOCKET;
 }
 
     socket->m_fd = INVALID_SOCKET;
 }
 


@@ -269,20 +272,12 @@ void GSocket_destroy(GSocket *socket)
 {
   assert(socket != NULL);
 
 {
   assert(socket != NULL);
 

-  /* When using CFSocket we MUST invalidate before closing the fd */
-#ifdef __DARWIN__
-  /* Per-socket GUI-specific cleanup */
-  _GSocket_GUI_Destroy_Socket(socket);
-#endif
-

   /* Check that the socket is really shutdowned */
   if (socket->m_fd != INVALID_SOCKET)
     GSocket_Shutdown(socket);
 
   /* Check that the socket is really shutdowned */
   if (socket->m_fd != INVALID_SOCKET)
     GSocket_Shutdown(socket);
 

-#ifndef __DARWIN__

   /* Per-socket GUI-specific cleanup */
   _GSocket_GUI_Destroy_Socket(socket);
   /* Per-socket GUI-specific cleanup */
   _GSocket_GUI_Destroy_Socket(socket);

-#endif

 
   /* Destroy private addresses */
   if (socket->m_local)
 
   /* Destroy private addresses */
   if (socket->m_local)