aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhristoterezov <hristo@jitsi.org>2013-11-29 12:03:03 +0200
committerhristoterezov <hristo@jitsi.org>2013-11-29 12:03:03 +0200
commit5a1703dfe8153f2780274506b6018d7d0564c610 (patch)
treef006e78256635992838e3bda05710d9ccd696eab
parentb3e888d582caa84d0ddf4425c73415a23e0f9cf3 (diff)
downloadjitsi-5a1703dfe8153f2780274506b6018d7d0564c610.zip
jitsi-5a1703dfe8153f2780274506b6018d7d0564c610.tar.gz
jitsi-5a1703dfe8153f2780274506b6018d7d0564c610.tar.bz2
Fixes NPE when inviting peers to chat room.
-rw-r--r--src/net/java/sip/communicator/impl/muc/ChatRoomQuery.java3
1 files changed, 2 insertions, 1 deletions
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