From 5eacaeb4a73aa4c4ff450d7b23acabe79124171f Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Tue, 27 Jan 2015 16:05:23 +0000
Subject: or of course we could just return the deferred

---
 synapse/handlers/events.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'synapse')

diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py
index 851eebf600..48de3630e3 100644
--- a/synapse/handlers/events.py
+++ b/synapse/handlers/events.py
@@ -99,7 +99,6 @@ class EventStreamHandler(BaseHandler):
 
                     # 10 seconds of grace to allow the client to reconnect again
                     #   before we think they're gone
-                    @defer.inlineCallbacks
                     def _later():
                         logger.debug(
                             "_later stopped_user_eventstream %s", auth_user
@@ -107,7 +106,7 @@ class EventStreamHandler(BaseHandler):
 
                         self._stop_timer_per_user.pop(auth_user, None)
 
-                        yield self.distributor.fire(
+                        return self.distributor.fire(
                             "stopped_user_eventstream", auth_user
                         )
 
-- 
cgit 1.4.1