1 files changed, 4 insertions, 5 deletions
diff --git a/src/kqueue.cpp b/src/kqueue.cpp
index 28c15de..f4c58a3 100644
--- a/src/kqueue.cpp
+++ b/src/kqueue.cpp
@@ -42,6 +42,10 @@ zmq::kqueue_t::kqueue_t ()
 
 zmq::kqueue_t::~kqueue_t ()
 {
+    //  Make sure there are no fds registered on shutdown.
+    zmq_assert (load.get () == 0);
+
+    worker.stop ();
     close (kqueue_fd);
 }
 
@@ -144,11 +148,6 @@ void zmq::kqueue_t::stop ()
     stopping = true;
 }
 
-void zmq::kqueue_t::join ()
-{
-    worker.stop ();
-}
-
 void zmq::kqueue_t::loop ()
 {
     while (!stopping) {