summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-11 10:57:03 +0000
committerErik Johnston <erik@matrix.org>2017-01-11 10:57:03 +0000
commit7b62d0bc70903d3c0cf49d67db31fa3682e33a55 (patch)
treeb757f939cedeeae7119bacf1a0196242e22b7c7a /synapse
parentcredit patrik properly (diff)
downloadsynapse-7b62d0bc70903d3c0cf49d67db31fa3682e33a55.tar.xz
Add missing None check
Diffstat (limited to '')
-rw-r--r--synapse/handlers/room_member.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index 8a76469b77..b2806555cf 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -232,11 +232,12 @@ class RoomMemberHandler(BaseHandler):
                     errcode=Codes.BAD_STATE
                 )
 
-            same_content = content == old_state.content
-            same_membership = old_membership == effective_membership_state
-            same_sender = requester.user.to_string() == old_state.sender
-            if same_sender and same_membership and same_content:
-                defer.returnValue(old_state)
+            if old_state:
+                same_content = content == old_state.content
+                same_membership = old_membership == effective_membership_state
+                same_sender = requester.user.to_string() == old_state.sender
+                if same_sender and same_membership and same_content:
+                    defer.returnValue(old_state)
 
         is_host_in_room = yield self._is_host_in_room(current_state_ids)