diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-13 14:23:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-14 10:22:43 +0100 |
| commit | 6f7540ada44b26d6eced6788650a08df672d0610 (patch) | |
| tree | 37fbc9d465a630ec2ac244d8860b35bbfcbd697d /synapse/storage | |
| parent | Fix email push notifs being dropped (diff) | |
| parent | Merge pull request #1168 from matrix-org/rav/ui_auth_on_device_delete (diff) | |
| download | synapse-6f7540ada44b26d6eced6788650a08df672d0610.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_email_notifs
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/room.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 2ef13d7403..11813b44f6 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -320,6 +320,9 @@ class RoomStore(SQLBaseStore): txn.execute(sql, (prev_id, current_id, limit,)) return txn.fetchall() + if prev_id == current_id: + return defer.succeed([]) + return self.runInteraction( "get_all_new_public_rooms", get_all_new_public_rooms ) |