Get the stock label when stock ID is used with empty label in Create()

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

diff --git a/src/unix/gsocket.cpp b/src/unix/gsocket.cpp
index 488b28e62b94acf1b29462bbd90845d6992a88e7..f857c3c176107eb621662be1b9eeb355fd3d8410 100644 (file)
--- a/src/unix/gsocket.cpp
+++ b/src/unix/gsocket.cpp
@@ -254,6 +254,7 @@ GSocket::GSocket()
   m_stream              = true;
   m_gui_dependent       = NULL;
   m_non_blocking        = false;
   m_stream              = true;
   m_gui_dependent       = NULL;
   m_non_blocking        = false;

+  m_reusable            = false;

   m_timeout             = 10*60*1000;
                                 /* 10 minutes * 60 sec * 1000 millisec */
   m_establishing        = false;
   m_timeout             = 10*60*1000;
                                 /* 10 minutes * 60 sec * 1000 millisec */
   m_establishing        = false;


@@ -923,7 +924,7 @@ GSocketEventFlags GSocket::Select(GSocketEventFlags flags)
 
     /* Do not use a static struct, Linux can garble it */
     tv.tv_sec = m_timeout / 1000;
 
     /* Do not use a static struct, Linux can garble it */
     tv.tv_sec = m_timeout / 1000;

-    tv.tv_usec = (m_timeout % 1000) / 1000;
+    tv.tv_usec = (m_timeout % 1000) * 1000;

 
     FD_ZERO(&readfds);
     FD_ZERO(&writefds);
 
     FD_ZERO(&readfds);
     FD_ZERO(&writefds);