From 8d910ff5b9610ffd22dda7253221891106460c29 Mon Sep 17 00:00:00 2001
From: Matrix <matrix@matrix.org>
Date: Fri, 24 Feb 2017 16:01:57 +0000
Subject: Local changes

---
 synapse/push/emailpusher.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'synapse/push/emailpusher.py')

diff --git a/synapse/push/emailpusher.py b/synapse/push/emailpusher.py
index 2eb325c7c7..b3e0098a86 100644
--- a/synapse/push/emailpusher.py
+++ b/synapse/push/emailpusher.py
@@ -218,7 +218,8 @@ class EmailPusher(object):
         )
 
     def seconds_until(self, ts_msec):
-        return (ts_msec - self.clock.time_msec()) / 1000
+        secs = (ts_msec - self.clock.time_msec()) / 1000
+        return max(secs, 0)  # Ensure non-negative
 
     def get_room_throttle_ms(self, room_id):
         if room_id in self.throttle_params:
-- 
cgit 1.5.1