summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2016-03-04 09:29:15 +0000
committerRichard van der Hoff <github@rvanderhoff.org.uk>2016-03-04 09:29:15 +0000
commit09b1d9807005115cef265ef03df4eaf251dbdca7 (patch)
treeb0ae282b901d054498252c6763c69a6e92ec55d4 /synapse
parentMerge pull request #614 from matrix-org/erikj/alias_delete (diff)
parentMake sure we add all invited members before returning from createRoom (diff)
downloadsynapse-09b1d9807005115cef265ef03df4eaf251dbdca7.tar.xz
Merge pull request #623 from matrix-org/rav/fix_createroom_race
Make sure we add all invited members before returning from createRoom
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/room.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 6dd7a41f04..0cb6c521c4 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -210,7 +210,7 @@ class RoomCreationHandler(BaseHandler):
                 ratelimit=False)
 
         for invitee in invite_list:
-            room_member_handler.update_membership(
+            yield room_member_handler.update_membership(
                 requester,
                 UserID.from_string(invitee),
                 room_id,