From 5a1703dfe8153f2780274506b6018d7d0564c610 Mon Sep 17 00:00:00 2001
From: hristoterezov <hristo@jitsi.org>
Date: Fri, 29 Nov 2013 12:03:03 +0200
Subject: Fixes NPE when inviting peers to chat room.

---
 src/net/java/sip/communicator/impl/muc/ChatRoomQuery.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/net/java/sip/communicator/impl/muc/ChatRoomQuery.java b/src/net/java/sip/communicator/impl/muc/ChatRoomQuery.java
index c6d9db9..789c8c8 100644
--- a/src/net/java/sip/communicator/impl/muc/ChatRoomQuery.java
+++ b/src/net/java/sip/communicator/impl/muc/ChatRoomQuery.java
@@ -205,7 +205,8 @@ public class ChatRoomQuery
                 ChatRoomWrapper chatRoom 
                     = MUCActivator.getMUCService()
                         .findChatRoomWrapperFromChatRoom(sourceChatRoom);
-                addChatRoom(sourceChatRoom, false, chatRoom.isAutojoin());
+                if(chatRoom != null)
+                    addChatRoom(sourceChatRoom, false, chatRoom.isAutojoin());
             }
         }
         else if ((LocalUserChatRoomPresenceChangeEvent
-- 
cgit v1.1