aboutsummaryrefslogtreecommitdiffstats
path: root/src/net
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2010-06-21 15:00:58 +0000
committerDamian Minkov <damencho@jitsi.org>2010-06-21 15:00:58 +0000
commitf9961d971e5c119335cbad1b4b62337ef7739b51 (patch)
tree63afcda0304529b0332ed4fe2d38dcca72a600d8 /src/net
parentdd45aef86ab6cec89bf53443312c74bb5cf3b1ba (diff)
downloadjitsi-f9961d971e5c119335cbad1b4b62337ef7739b51.zip
jitsi-f9961d971e5c119335cbad1b4b62337ef7739b51.tar.gz
jitsi-f9961d971e5c119335cbad1b4b62337ef7739b51.tar.bz2
Fix NPE when removing group.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
index 1265e8f..d6a2db1 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/TreeContactList.java
@@ -896,6 +896,11 @@ public class TreeContactList
UIGroup parentGroup = group.getParentGroup();
+ // when metalist removes non empty group, first removes the
+ // contacts and with the last one it removes the group, as its non empty
+ if(parentGroup == null)
+ return;
+
GroupNode parentGroupNode
= parentGroup.getGroupNode();