diff options
| author | malosek <malosek@fastmq.com> | 2009-09-16 17:07:15 +0200 |
|---|---|---|
| committer | malosek <malosek@fastmq.com> | 2009-09-16 17:07:15 +0200 |
| commit | 3ebe9932f9c208966f8cb97d631d26df0367c151 (patch) | |
| tree | eb5a3c374f2bee3d0336bc3b29ebe5980cf841aa /src/poll.cpp | |
| parent | 1a655045951c29edda0b616640b9dac507cda164 (diff) | |
| parent | d16b3bc0c93452a4be7d06525793ac5190e38031 (diff) | |
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'src/poll.cpp')
| -rw-r--r-- | src/poll.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/poll.cpp b/src/poll.cpp index 94e4fd4..dd3de43 100644 --- a/src/poll.cpp +++ b/src/poll.cpp @@ -52,10 +52,10 @@ zmq::poll_t::poll_t () : zmq::poll_t::~poll_t () { + worker.stop (); + // Make sure there are no fds registered on shutdown. zmq_assert (load.get () == 0); - - worker.stop (); } zmq::handle_t zmq::poll_t::add_fd (fd_t fd_, i_poll_events *events_) |