diff options
author | Martin Sustrik <sustrik@fastmq.com> | 2009-09-14 12:28:13 +0200 |
---|---|---|
committer | Martin Sustrik <sustrik@fastmq.com> | 2009-09-14 12:28:13 +0200 |
commit | 37cacc5700eaaaddbe2df6e3affeca4a335b023a (patch) | |
tree | 18e94855e313803ba1229cf07c56e9d396e8fa5f /src | |
parent | c806aabb2d3e6b1ba9e3f61319f23d45c7f9a007 (diff) |
ZMQII-1: Win32 - failure on shutdown
Diffstat (limited to 'src')
-rw-r--r-- | src/select.cpp | 4 | ||||
-rw-r--r-- | src/socket_base.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
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; } |