diff options
| author | hristoterezov <hristo@jitsi.org> | 2013-11-26 16:51:55 +0200 |
|---|---|---|
| committer | hristoterezov <hristo@jitsi.org> | 2013-11-26 16:51:55 +0200 |
| commit | c0f4ebdcd137fbdc622f4e71b82ccd77bc94e24f (patch) | |
| tree | ce9e9eb98a6f228691c3386df7967e52d2c72b0b /src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java | |
| parent | 49030edb870236acdb9508510ce69e609056a7d7 (diff) | |
| download | jitsi-c0f4ebdcd137fbdc622f4e71b82ccd77bc94e24f.zip jitsi-c0f4ebdcd137fbdc622f4e71b82ccd77bc94e24f.tar.gz jitsi-c0f4ebdcd137fbdc622f4e71b82ccd77bc94e24f.tar.bz2 | |
Removes the list of existing rooms in the "Go to chat room" dialog and
adds nickname and subject fields to the dialog.
Diffstat (limited to 'src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java')
| -rw-r--r-- | src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java b/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java index b0fa942..6b560fb 100644 --- a/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java +++ b/src/net/java/sip/communicator/impl/muc/MUCCustomContactActionService.java @@ -473,6 +473,9 @@ public class MUCCustomContactActionService = (ChatRoomSourceContact) actionSource;
ChatRoomWrapper room = MUCActivator.getMUCService()
.findChatRoomWrapperFromSourceContact(contact);
+ if(room == null)
+ return false;
+
if(name.equals("autojoin"))
return !room.isAutojoin();
|