summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToralf Wittner <toralf.wittner@gmail.com>2010-10-16 08:27:57 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-10-16 08:27:57 +0200
commita1474e305762d32df2b79300d124aac7fa0181c8 (patch)
tree183c9adcc389ddde5846765d1763359e60ecee94
parent733c6780c557a0eaacdf17961fb8f3841c65f862 (diff)
Cancel tx_timer_id in pgm_sender_t::out_event().
Signed-off-by: Toralf Wittner <toralf.wittner@gmail.com>
-rw-r--r--AUTHORS1
-rw-r--r--src/pgm_sender.cpp6
2 files changed, 4 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 5606a9f..80be1ef 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -44,6 +44,7 @@ Tamara Kustarova <kustarova.tamara@gmail.com>
Taras Shpot <taras.shpot@eleks.com>
Tero Marttila <terom@fixme.fi>
Terry Wilson <terry@logivox.net>
+Toralf Wittner <toralf.wittner@gmail.com>
Vitaly Mayatskikh <v.mayatskih@gmail.com>
Credits
diff --git a/src/pgm_sender.cpp b/src/pgm_sender.cpp
index 55a8d4e..957de6d 100644
--- a/src/pgm_sender.cpp
+++ b/src/pgm_sender.cpp
@@ -174,9 +174,9 @@ void zmq::pgm_sender_t::out_event ()
put_uint16 (out_buffer, offset == -1 ? 0xffff : (uint16_t) offset);
}
- if (has_rx_timer) {
- cancel_timer (rx_timer_id);
- has_rx_timer = false;
+ if (has_tx_timer) {
+ cancel_timer (tx_timer_id);
+ has_tx_timer = false;
}
// Send the data.