From a801b6d8b37557ccfb53030dca22f89a3f99b59c Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Thu, 20 Aug 2009 11:32:23 +0200 Subject: couple of bugs in shutdown mechanism fixed --- src/zmq_init.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/zmq_init.cpp') diff --git a/src/zmq_init.cpp b/src/zmq_init.cpp index fea1452..124622d 100644 --- a/src/zmq_init.cpp +++ b/src/zmq_init.cpp @@ -22,8 +22,8 @@ #include "session.hpp" #include "err.hpp" -zmq::zmq_init_t::zmq_init_t (io_thread_t *parent_, object_t *owner_, fd_t fd_, - bool connected_, const options_t &options_) : +zmq::zmq_init_t::zmq_init_t (io_thread_t *parent_, socket_base_t *owner_, + fd_t fd_, bool connected_, const options_t &options_) : owned_t (parent_, owner_), connected (connected_), options (options_) @@ -81,13 +81,15 @@ void zmq::zmq_init_t::flush () void zmq::zmq_init_t::process_plug () { + zmq_assert (engine); engine->plug (this); owned_t::process_plug (); } void zmq::zmq_init_t::process_unplug () { - engine->unplug (); + if (engine) + engine->unplug (); } void zmq::zmq_init_t::create_session () -- cgit v1.2.3