1 files changed, 6 insertions, 3 deletions
diff --git a/src/zmq_listener.cpp b/src/zmq_listener.cpp
index 9c9bbe9..463a1dd 100644
--- a/src/zmq_listener.cpp
+++ b/src/zmq_listener.cpp
@@ -29,8 +29,6 @@ zmq::zmq_listener_t::zmq_listener_t (io_thread_t *parent_, object_t *owner_) :
 
 zmq::zmq_listener_t::~zmq_listener_t ()
 {
-    if (plugged_in)
-        rm_fd (handle);
 }
 
 int zmq::zmq_listener_t::set_address (const char *addr_)
@@ -45,12 +43,17 @@ void zmq::zmq_listener_t::process_plug ()
     zmq_assert (rc == 0);
 
     //  Start polling for incoming connections.
-    handle = add_fd (tcp_listener.get_fd (), this);
+    handle = add_fd (tcp_listener.get_fd ());
     set_pollin (handle);
 
     io_object_t::process_plug ();
 }
 
+void zmq::zmq_listener_t::process_unplug ()
+{
+    rm_fd (handle);
+}
+
 void zmq::zmq_listener_t::in_event ()
 {
     fd_t fd = tcp_listener.accept ();