From 2f75bb75dd604f329dd4f1a71a01f0ea5f8b4fdc Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 18 Sep 2015 01:55:32 +0200
Subject: [PATCH] fix NPE if our user does not yet appear to be in the queried
 room

---
 lib/pushprocessor.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/pushprocessor.js b/lib/pushprocessor.js
index 7d3ccf43d..e36b12f29 100644
--- a/lib/pushprocessor.js
+++ b/lib/pushprocessor.js
@@ -140,7 +140,8 @@ function PushProcessor(client) {
         }
 
         var room = client.getRoom(ev.room_id);
-        if (!room || !room.currentState || !room.currentState.members) { return false; }
+        if (!room || !room.currentState || !room.currentState.members ||
+            !room.currentState.getMember(client.credentials.userId) { return false; }
 
         var displayName = room.currentState.getMember(client.credentials.userId).name;