From 77e948a0fa4157a0b22b638f69304de42dcc0e20 Mon Sep 17 00:00:00 2001
From: Lyndon Jetten <lyndon.jetten@ownsoft.de>
Date: Tue, 4 Jul 2023 12:45:36 +0200
Subject: [PATCH] .

---
 ChatController/ChatMainControl.xaml.cs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ChatController/ChatMainControl.xaml.cs b/ChatController/ChatMainControl.xaml.cs
index 6be474c..6aec4da 100644
--- a/ChatController/ChatMainControl.xaml.cs
+++ b/ChatController/ChatMainControl.xaml.cs
@@ -411,7 +411,7 @@ namespace ChatController
 
                 contact.IsNewMessage = false;
 
-                var shouldChangeIcon = _ContactList.Any(contactDependencyObject => contactDependencyObject.Contact.IsNewMessage);
+                var shouldChangeIcon = _ContactList.Any(contactDependencyObject => contactDependencyObject.Contact?.IsNewMessage ?? false);
                 if(shouldChangeIcon)
                 {
                     ContainingWindow.Icon = Utils.ConvertIconToImageSource(Resource.ownchat_favicon);
@@ -421,11 +421,14 @@ namespace ChatController
 
                 OnPropertyChanged(nameof(IsSendButtonEnabled));
 
-                foreach(ContactDependencyObject item in Clientlist.Items)
+                if(!(Clientlist is null))
                 {
-                    if(item.Contact.Equals(contact))
+                    foreach(var obj in Clientlist.Items)
                     {
-                        Clientlist.SelectedItem = item;
+                        if(obj is ContactDependencyObject contactDependencyObject && Equals(contactDependencyObject.Contact, contact))
+                        {
+                            Clientlist.SelectedItem = obj;
+                        }
                     }
                 }