mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-12 18:40:27 +01:00
Merge pull request #1179 from hurtonm/master
Stop session's timer when pipe terminates
This commit is contained in:
commit
4b70793f1f
@ -206,10 +206,14 @@ void zmq::session_base_t::pipe_terminated (pipe_t *pipe_)
|
||||
|| pipe_ == zap_pipe
|
||||
|| terminating_pipes.count (pipe_) == 1);
|
||||
|
||||
if (pipe_ == pipe)
|
||||
if (pipe_ == pipe) {
|
||||
// If this is our current pipe, remove it
|
||||
pipe = NULL;
|
||||
else
|
||||
if (has_linger_timer) {
|
||||
cancel_timer (linger_timer_id);
|
||||
has_linger_timer = false;
|
||||
}
|
||||
} else
|
||||
if (pipe_ == zap_pipe)
|
||||
zap_pipe = NULL;
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user