aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2012-01-09 15:52:39 +0000
committerDamian Minkov <damencho@jitsi.org>2012-01-09 15:52:39 +0000
commit18eb48fe7d8fccd88138a3cc94bca0d618606574 (patch)
tree65a34947cfab26d79ab7b4a4fd25db0d424ebde4 /src/net/java
parentdfcd34f29b91481416f4af4d49b9dc540dd1d3b6 (diff)
downloadjitsi-18eb48fe7d8fccd88138a3cc94bca0d618606574.zip
jitsi-18eb48fe7d8fccd88138a3cc94bca0d618606574.tar.gz
jitsi-18eb48fe7d8fccd88138a3cc94bca0d618606574.tar.bz2
Fixes possible NPE, making some contacts to disappear from contactlist.
Diffstat (limited to 'src/net/java')
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
index c88a917..1b9745b 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListTreeCellRenderer.java
@@ -385,7 +385,7 @@ public class ContactListTreeCellRenderer
this.nameLabel.setText(displayName);
- if(contactList.isContactActive(contact))
+ if(statusIcon != null && contactList.isContactActive(contact))
statusIcon.setImage(msgReceivedImage);
else
statusIcon = contact.getStatusIcon();