From 23d285ad57ca76e8ff2d33f1f6e476930689d9a7 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Thu, 9 Apr 2015 11:41:50 +0100
Subject: Unset the timer in the timeout callback so that we don't try to
 cancel it if it has been called

---
 synapse/notifier.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/synapse/notifier.py b/synapse/notifier.py
index 0fa77d28ca..e6f37c3736 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -404,6 +404,7 @@ class Notifier(object):
         def _timeout_listener():
             # TODO (erikj): We should probably set to_token to the current
             # max rather than reusing from_token.
+            listener.timer = None
             listener.notify(
                 self,
                 [],
-- 
cgit 1.4.1