Commit 99805931 authored by BJovke's avatar BJovke Committed by GitHub

Merge pull request #2591 from laplaceyang/pr_cancel_timer_in_reconnect

fix bug: coredump if set linger and immediate together
parents bcc30f2a 67a6594f
...@@ -506,6 +506,11 @@ void zmq::session_base_t::reconnect () ...@@ -506,6 +506,11 @@ void zmq::session_base_t::reconnect ()
pipe->terminate (false); pipe->terminate (false);
terminating_pipes.insert (pipe); terminating_pipes.insert (pipe);
pipe = NULL; pipe = NULL;
if (has_linger_timer) {
cancel_timer (linger_timer_id);
has_linger_timer = false;
}
} }
reset (); reset ();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment