From 0ad6d0616f9663814f6f9f24590833425f6ad372 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 20 Nov 2014 18:20:42 +0100
Subject: brought ad hoc conferences back. fixed #688 fixed #367

---
 src/main/java/eu/siacs/conversations/services/AvatarService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/eu/siacs/conversations/services/AvatarService.java')

diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index b8154d655..1125859c3 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) {
-- 
cgit v1.2.3