This commit is contained in:
2023-07-04 12:45:36 +02:00
parent c691dd281f
commit 77e948a0fa

View File

@@ -411,7 +411,7 @@ namespace ChatController
contact.IsNewMessage = false; contact.IsNewMessage = false;
var shouldChangeIcon = _ContactList.Any(contactDependencyObject => contactDependencyObject.Contact.IsNewMessage); var shouldChangeIcon = _ContactList.Any(contactDependencyObject => contactDependencyObject.Contact?.IsNewMessage ?? false);
if(shouldChangeIcon) if(shouldChangeIcon)
{ {
ContainingWindow.Icon = Utils.ConvertIconToImageSource(Resource.ownchat_favicon); ContainingWindow.Icon = Utils.ConvertIconToImageSource(Resource.ownchat_favicon);
@@ -421,11 +421,14 @@ namespace ChatController
OnPropertyChanged(nameof(IsSendButtonEnabled)); 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;
}
} }
} }