From d7e225c0afdd986ee4fa7c1cf3e7812066117c9d Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Wed, 6 Jul 2016 19:14:53 +0200
Subject: [PATCH] Kill timers when removing IO handler (#1554)

---
 util/src/io/service.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/util/src/io/service.rs b/util/src/io/service.rs
index 07e60f766..1e2169808 100644
--- a/util/src/io/service.rs
+++ b/util/src/io/service.rs
@@ -248,6 +248,13 @@ impl<Message> Handler for IoManager<Message> where Message: Send + Clone + Sync
 			IoMessage::RemoveHandler { handler_id } => {
 				// TODO: flush event loop
 				self.handlers.remove(handler_id);
+				// unregister timers
+				let mut timers = self.timers.write().unwrap();
+				let to_remove: Vec<_> = timers.keys().cloned().filter(|timer_id| timer_id / TOKENS_PER_HANDLER == handler_id).collect();
+				for timer_id in to_remove {
+					let timer = timers.remove(&timer_id).expect("to_remove only contains keys from timers; qed");
+					event_loop.clear_timeout(timer.timeout);
+				}
 			},
 			IoMessage::AddTimer { handler_id, token, delay } => {
 				let timer_id = token + handler_id * TOKENS_PER_HANDLER;