summaryrefslogtreecommitdiff
path: root/src/pgm_receiver.cpp
diff options
context:
space:
mode:
authorSteven McCoy <steven.mccoy@miru.hk>2010-10-11 17:59:58 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-10-11 17:59:58 +0200
commit5b8af52efc0ddf1df5506a2800aa69bc50a44ddb (patch)
treebca243aa3f36973c46adf58824d5aed08c1ab34f /src/pgm_receiver.cpp
parente168173162dd26238a799c19142bab8b7885ebb3 (diff)
Fix assertion in PGM transports on cancel_timer
Signed-off-by: Steven McCoy <steven.mccoy@miru.hk>
Diffstat (limited to 'src/pgm_receiver.cpp')
-rw-r--r--src/pgm_receiver.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/pgm_receiver.cpp b/src/pgm_receiver.cpp
index 01b95b2..b0e92f9 100644
--- a/src/pgm_receiver.cpp
+++ b/src/pgm_receiver.cpp
@@ -235,6 +235,8 @@ void zmq::pgm_receiver_t::timer_event (int token)
{
zmq_assert (token == rx_timer_id);
+ // Timer cancels on return by poller_base.
+ has_rx_timer = false;
in_event ();
}