From 1674a4127b2a7fe8cc62297b550c324cf6620b72 Mon Sep 17 00:00:00 2001
From: Benoit Martins <benoit.martins@belledonne-communications.com>
Date: Mon, 9 Sep 2024 10:12:56 +0200
Subject: [PATCH] Fix getAvatarModelFromAddress crash

---
 Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift b/Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift
index 1ce1df3f4..46b2f0381 100644
--- a/Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift
+++ b/Linphone/UI/Main/Contacts/Model/ContactAvatarModel.swift
@@ -139,7 +139,7 @@ class ContactAvatarModel: ObservableObject {
 			if let addressFriend = resultFriend {
 				if addressFriend.address != nil {
 					var avatarModel = ContactsManager.shared.avatarListModel.first(where: {
-						$0.friend!.name == addressFriend.name
+						$0.friend != nil && $0.friend!.name == addressFriend.name && $0.friend!.address != nil
 						&& $0.friend!.address!.asStringUriOnly() == addressFriend.address!.asStringUriOnly()
 					})