summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-31 09:01:11 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-10-31 09:02:04 (GMT)
commit85a80452ca28ed82183fabb847ec39a2bd47dac9 (patch)
tree9989e249428212d1686bc899f2100e0d25ca9062
parent966571644a51763b4a8da9c2c648f25301a4fb80 (diff)
downloadswift-contrib-85a80452ca28ed82183fabb847ec39a2bd47dac9.zip
swift-contrib-85a80452ca28ed82183fabb847ec39a2bd47dac9.tar.bz2
Remove pending events from a Timer when the timer is stopped.
-rw-r--r--Swiften/Network/BoostTimer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/Swiften/Network/BoostTimer.cpp b/Swiften/Network/BoostTimer.cpp
index ab6fbe0..1812688 100644
--- a/Swiften/Network/BoostTimer.cpp
+++ b/Swiften/Network/BoostTimer.cpp
@@ -24,6 +24,7 @@ void BoostTimer::start() {
void BoostTimer::stop() {
timer.cancel();
+ eventLoop->removeEventsFromOwner(shared_from_this());
}
void BoostTimer::handleTimerTick(const boost::system::error_code& error) {