1 files changed, 4 insertions, 6 deletions
diff --git a/src/epoll.cpp b/src/epoll.cpp
index c4c8fdb..15278c6 100644
--- a/src/epoll.cpp
+++ b/src/epoll.cpp
@@ -41,8 +41,11 @@ zmq::epoll_t::epoll_t () :
 
 zmq::epoll_t::~epoll_t ()
 {
-    close (epoll_fd);
+    //  Make sure there are no fds registered on shutdown.
+    zmq_assert (load.get () == 0);
 
+    worker.stop ();
+    close (epoll_fd);
     for (retired_t::iterator it = retired.begin (); it != retired.end (); it ++)
         delete *it;
 }
@@ -144,11 +147,6 @@ void zmq::epoll_t::stop ()
     stopping = true;
 }
 
-void zmq::epoll_t::join ()
-{
-    worker.stop ();
-}
-
 void zmq::epoll_t::loop ()
 {
     epoll_event ev_buf [max_io_events];