From 7377dd30d17ec719026b059e0bfa77510a94c237 Mon Sep 17 00:00:00 2001 From: Lyndon Jetten Date: Thu, 25 Feb 2021 12:33:00 +0100 Subject: [PATCH] =?UTF-8?q?Null-Check=20bei=20Klick=20auf=20Benachrichtigu?= =?UTF-8?q?ng.=20F=C3=BChrte=20zu=20Exception=20im=20BeWoPlaner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ChatController/ChatMainControl.xaml.cs | 23 +++++++++++++++++++---- ChatController/HauptKlassen/Chat.cs | 2 +- PrototypChat/.vs/PrototypChat/v16/.suo | Bin 217600 -> 221184 bytes 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ChatController/ChatMainControl.xaml.cs b/ChatController/ChatMainControl.xaml.cs index 1a7dcaf..65b4374 100644 --- a/ChatController/ChatMainControl.xaml.cs +++ b/ChatController/ChatMainControl.xaml.cs @@ -236,6 +236,11 @@ namespace ChatController { DisposeAndRemoveNotification((NotifyIcon)sender, pGroupId); + if(_ContainingWindow == null) + { + return; + } + if (_ContainingWindow.WindowState == WindowState.Minimized) { _ContainingWindow.WindowState = WindowState.Normal; @@ -243,7 +248,11 @@ namespace ChatController _ContainingWindow.Activate(); - SelectContact(_ContactList.FirstOrDefault(f => f.GroupId.Equals(pGroupId))); + var selectedContact = _ContactList?.FirstOrDefault(f => f?.GroupId == pGroupId); + if(selectedContact != null) + { + SelectContact(selectedContact); + } }; notifyIcon.BalloonTipClosed += (sender, args) => @@ -298,9 +307,9 @@ namespace ChatController private void Clientlist_OnSelectionChanged(object sender, SelectionChangedEventArgs e) { - if(Clientlist.SelectedItem != null) + if(Clientlist?.SelectedItem != null && Clientlist?.SelectedItem is Contact selectedContact) { - SelectContact((Contact) Clientlist.SelectedItem); + SelectContact(selectedContact); } } @@ -1111,11 +1120,17 @@ namespace ChatController } // Wird im BeWoPlaner benutzt - public Contact GetCurrentContact() + public Contact GetCurrentContactWithUserIdManage() { return CurrentContact?.UserIdManage != null ? CurrentContact : null; } + // Wird im BeWoPlaner benutzt + public Contact GetCurrentContact() + { + return CurrentContact; + } + // Wird im BeWoPlaner benutzt public void AddContextMenu(string menuItemText, Action callBackAction) { diff --git a/ChatController/HauptKlassen/Chat.cs b/ChatController/HauptKlassen/Chat.cs index 0a5daf8..8184c7d 100644 --- a/ChatController/HauptKlassen/Chat.cs +++ b/ChatController/HauptKlassen/Chat.cs @@ -485,7 +485,7 @@ namespace ChatController.HauptKlassen request.AddParameter(Constants.CustomerId, ChatDaten.Kundennummer); request.AddParameter(Constants.MultipartContentTypeValue, requestBody, ParameterType.RequestBody); - + client.PostAsync(request, (response, handle) => { diff --git a/PrototypChat/.vs/PrototypChat/v16/.suo b/PrototypChat/.vs/PrototypChat/v16/.suo index d2905cadab0b7fb1c2b293d46a8fbe0ab59ab45c..b23ec574aa15ad6e6cb8cca5a2c995654ae04ebb 100644 GIT binary patch delta 10628 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 delta 7659 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