diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-11-20 18:20:42 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-11-20 18:20:42 +0100 |
| commit | 0ad6d0616f9663814f6f9f24590833425f6ad372 (patch) | |
| tree | fa4b9b39accdf10e176b1c34e4f1b4b140cd6eed /src/main/java/eu/siacs/conversations/services/AvatarService.java | |
| parent | e9948f6b8417803e2856f53482d5a158eb9ffa2e (diff) | |
brought ad hoc conferences back. fixed #688 fixed #367
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/AvatarService.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/AvatarService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java index b8154d65..1125859c 100644 --- a/src/main/java/eu/siacs/conversations/services/AvatarService.java +++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java @@ -274,7 +274,7 @@ public class AvatarService { } } } - String name = user.getName(); + String name = contact != null ? contact.getDisplayName() : user.getName(); String letter; int color; if (name.length() > 0) { |