From 37cacc5700eaaaddbe2df6e3affeca4a335b023a Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@fastmq.com>
Date: Mon, 14 Sep 2009 12:28:13 +0200
Subject: ZMQII-1: Win32 - failure on shutdown

---
 src/select.cpp      | 4 ++--
 src/socket_base.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/select.cpp b/src/select.cpp
index f10acdc..cb17169 100644
--- a/src/select.cpp
+++ b/src/select.cpp
@@ -53,10 +53,10 @@ zmq::select_t::select_t () :
 
 zmq::select_t::~select_t ()
 {
+    worker.stop ();
+
     //  Make sure there are no fds registered on shutdown.
     zmq_assert (load.get () == 0);
-
-    worker.stop ();
 }
 
 zmq::handle_t zmq::select_t::add_fd (fd_t fd_, i_poll_events *events_)
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 0429726..51649fb 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -281,7 +281,7 @@ int zmq::socket_base_t::connect (const char *addr_)
 #endif
 
     //  Unknown address type.
-    errno = ENOTSUP;
+    errno = EFAULT;
     return -1;
 }
 
-- 
cgit v1.2.3