From 13724569eccbd2431f46868099afd44128af19d3 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 29 Jan 2016 15:33:44 +0000
Subject: [PATCH] Deal with None limit

---
 synapse/notifier.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/synapse/notifier.py b/synapse/notifier.py
index acd4019a9..32bd16661 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -376,10 +376,14 @@ class Notifier(object):
                     continue
                 if only_keys and name not in only_keys:
                     continue
+                if limit:
+                    new_limit = max(limit * 2, 10)
+                else:
+                    new_limit = 10
                 new_events, new_key = yield source.get_new_events(
                     user=user,
                     from_key=getattr(from_token, keyname),
-                    limit=max(limit * 2, 10),
+                    limit=new_limit,
                     is_guest=is_peeking,
                     room_ids=room_ids,
                 )